diff --git a/.travis.yml b/.travis.yml
index 6c16bdad821f0d..77694bddf3b05e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,3 @@
-x-ccache-setup-steps: &ccache-setup-steps
- - export CCACHE_NOSTATS=1
- - export CCACHE_SLOPPINESS="file_macro,include_file_mtime,include_file_ctime,time_macros,file_stat_matches"
- - export CC='ccache gcc-6'
- - export CXX='ccache g++-6'
-
os: linux
language: cpp
env:
@@ -13,7 +7,7 @@ env:
jobs:
include:
- stage: "Compile"
- name: "Compile V8"
+ name: "Compile Node.js"
cache: ccache
addons:
apt:
@@ -21,25 +15,16 @@ jobs:
- ubuntu-toolchain-r-test
packages:
- g++-6
- install: *ccache-setup-steps
- script:
- - pyenv global ${PYTHON_VERSION}
- - ./configure
- - make -j2 -C out V=1 v8
-
- - name: "Compile Node.js"
- cache: ccache
- addons:
- apt:
- sources:
- - ubuntu-toolchain-r-test
- packages:
- - g++-6
- install: *ccache-setup-steps
+ install:
+ - export CCACHE_NOSTATS=1
+ - export CCACHE_SLOPPINESS="file_macro,include_file_mtime,include_file_ctime,time_macros,file_stat_matches"
+ - export CC='ccache gcc-6'
+ - export CXX='ccache g++-6'
script:
- pyenv global ${PYTHON_VERSION}
- ./configure
- - make -j2 V=1
+ - timeout --preserve-status 45m make -j2 V=1
+ before_cache:
- cp out/Release/node /home/travis/.ccache
- cp out/Release/cctest /home/travis/.ccache
diff --git a/BUILDING.md b/BUILDING.md
index 0df731b099e5c5..08b75855ea6ee0 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -69,17 +69,14 @@ There are three support tiers:
* **Tier 1**: These platforms represent the majority of Node.js users. The
Node.js Build Working Group maintains infrastructure for full test coverage.
- Maintenance is supported by the Node.js core team. All commits to the
- Node.js repository are tested on multiple variants of these platforms. Test
+ All commits to the Node.js repository are tested on these platforms. Test
failures on tier 1 platforms will block releases.
* **Tier 2**: These platforms represent smaller segments of the Node.js user
base. The Node.js Build Working Group maintains infrastructure for full test
- coverage. Maintenance is supported by smaller groups or individuals within
- the Node.js core team, or the vendor of the platform itself. All commits to
- the Node.js repository are tested on multiple variants of these platforms
- where practical. Test failures on tier 2 platforms will block releases.
- Delays in release of binaries for these platforms are acceptable
- where necessary due to infrastructure concerns.
+ coverage. All commits to the Node.js repository are tested on these platforms.
+ Test failures on tier 2 platforms will block releases. Delays in release of
+ binaries for these platforms are acceptable where necessary due to
+ infrastructure concerns.
* **Experimental**: May not compile or test suite may not pass. The core team
does not create releases for these platforms. Test failures on experimental
platforms do not block releases. Contributions to improve support for these
@@ -371,6 +368,10 @@ loopback interface on Ubuntu:
sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
```
+You can use
+[node-code-ide-configs](https://github.com/nodejs/node-code-ide-configs)
+to run/debug tests, if your IDE configs are present.
+
#### Running Coverage
It's good practice to ensure any code you add or change is covered by tests.
@@ -475,7 +476,7 @@ To use the debug build with all the normal dependencies overwrite the release
version in the install directory:
``` console
-$ make install --prefix=/opt/node-debug/
+$ make install PREFIX=/opt/node-debug/
$ cp -a -f out/Debug/node /opt/node-debug/node
```
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b5817827fd274..b5c8f757eb7f80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,7 +30,8 @@ release.
-13.1.0
+13.2.0
+13.1.0
13.0.1
13.0.0
|
diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md
index 0315a2dbb83001..0c5711fe8a85c5 100644
--- a/COLLABORATOR_GUIDE.md
+++ b/COLLABORATOR_GUIDE.md
@@ -172,8 +172,16 @@ the comment anyway to avoid any doubt.
All fixes must have a test case which demonstrates the defect. The test should
fail before the change, and pass after the change.
-All pull requests must pass continuous integration tests on the
-[project CI server](https://ci.nodejs.org/).
+All pull requests must pass continuous integration tests. Code changes must pass
+on [project CI server](https://ci.nodejs.org/). Pull requests that only change
+documentation and comments can use Travis CI results.
+
+Travis CI jobs have a fixed running time limit that building Node.js sometimes
+exceeds. If the `Compile Node.js` Travis CI job has timed out it will fail after
+around 45 minutes. The exit code will be 143, indicating that a `SIGTERM` signal
+terminated the `make` command. When this happens, restart the timed out job. It
+will reuse built artifacts from the previous timed-out run, and thus take less
+time to complete.
Do not land any pull requests without passing (green or yellow) CI runs. If
there are CI failures unrelated to the change in the pull request, try "Resume
@@ -181,16 +189,18 @@ Build". It is in the left navigation of the relevant `node-test-pull-request`
job. It will preserve all the green results from the current job but re-run
everything else.
+Some of the CI Jobs may require `GIT_REMOTE_REF` which is the remote portion
+of Git refspec. To specify the branch this way `refs/heads/BRANCH` is used
+(i.e for `master` -> `refs/heads/master`).
+For pull requests it will look like `refs/pull/PR_NUMBER/head`
+(i.e. for PR#42 -> `refs/pull/42/head`).
+
#### Useful CI Jobs
* [`node-test-pull-request`](https://ci.nodejs.org/job/node-test-pull-request/)
is the CI job to test pull requests. It runs the `build-ci` and `test-ci`
targets on all supported platforms.
-* [`node-test-pull-request-lite-pipeline`](https://ci.nodejs.org/job/node-test-pull-request-lite-pipeline/)
-runs the linter job. It also runs the tests on a very fast host. This is useful
-for changes that only affect comments or documentation.
-
* [`citgm-smoker`](https://ci.nodejs.org/job/citgm-smoker/)
uses [`CitGM`](https://github.com/nodejs/citgm) to allow you to run
`npm install && npm test` on a large selection of common modules. This is
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index c8560291164f36..d7cb6e321e16cb 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -15,22 +15,21 @@
## Collaborators
Node.js Core Collaborators maintain the [nodejs/node][] GitHub repository.
-The GitHub team for Node.js Core Collaborators is @nodejs/collaborators. Their
-privileges include but are not limited to:
+The GitHub team for Node.js Core Collaborators is @nodejs/collaborators.
+Collaborators have:
* Commit access to the [nodejs/node][] repository
* Access to the Node.js continuous integration (CI) jobs
Both Collaborators and non-Collaborators may propose changes to the Node.js
source code. The mechanism to propose such a change is a GitHub pull request.
-Collaborators are responsible for reviewing and merging (_landing_)
-pull requests.
+Collaborators review and merge (_land_) pull requests.
-At least two Collaborators must approve a pull request before the pull request
-can land. (One Collaborator approval is enough if the pull request has been open
-for more than 7 days.) Approving a pull request indicates that the Collaborator
-accepts responsibility for the change. Approval must be from Collaborators who
-are not authors of the change.
+Two Collaborators must approve a pull request before the pull request can land.
+(One Collaborator approval is enough if the pull request has been open for more
+than 7 days.) Approving a pull request indicates that the Collaborator accepts
+responsibility for the change. Approval must be from Collaborators who are not
+authors of the change.
If a Collaborator opposes a proposed change, then the change cannot land. The
exception is if the TSC votes to approve the change despite the opposition.
@@ -39,13 +38,11 @@ result in Collaborators removing their opposition.
See:
-* [Current list of Collaborators](./README.md#current-project-team-members)
+* [List of Collaborators](./README.md#current-project-team-members)
* [A guide for Collaborators](./COLLABORATOR_GUIDE.md)
### Collaborator Activities
-Typical activities of a Collaborator include:
-
* Helping users and novice contributors
* Contributing code and documentation changes that improve the project
* Reviewing and commenting on issues and pull requests
@@ -71,7 +68,7 @@ The current list of TSC members is in
[the project README](./README.md#current-project-team-members).
The [TSC Charter][] governs the operations of the TSC. All changes to the
-Charter need approval by the Node.js Board of Directors.
+Charter need approval by the OpenJS Foundation Board of Directors.
### TSC Meetings
@@ -124,7 +121,7 @@ Provide a summary of the nominee's contributions. For example:
* Use the link `https://github.com/nodejs/node/issues?q=commenter:GITHUB_ID`
* Reviews on pull requests in the [nodejs/node][] repository
* Use the link `https://github.com/nodejs/node/pulls?q=reviewed-by:GITHUB_ID`
-* Help provided to end users and novice contributors
+* Help provided to end-users and novice contributors
* Pull requests and issues opened throughout the Node.js organization
* Use the link `https://github.com/search?q=author:GITHUB_ID+org:nodejs`
* Comments on pull requests and issues throughout the Node.js organization
@@ -144,16 +141,15 @@ frictionless as possible. Use the [Collaborators discussion page][] to request
feedback from other Collaborators in private. A nominator may also work with the
nominee to improve their contribution profile.
-It is possible that Collaborators will overlook someone with valuable
-contributions. In that case, the contributor may open an issue or contact a
-Collaborator to request a nomination.
+Collaborators might overlook someone with valuable contributions. In that case,
+the contributor may open an issue or contact a Collaborator to request a
+nomination.
### Onboarding
After the nomination passes, a TSC member onboards the new Collaborator. See
-[the onboarding guide](./doc/onboarding.md) on details of the onboarding
-process. In general, the onboarding should occur within a month after the
-nomination passes.
+[the onboarding guide](./doc/onboarding.md) for details of the onboarding
+process.
## Consensus Seeking Process
diff --git a/Makefile b/Makefile
index 8d4e6bbe6474b9..d46b4a0c18a3d6 100644
--- a/Makefile
+++ b/Makefile
@@ -300,7 +300,7 @@ jstest: build-addons build-js-native-api-tests build-node-api-tests ## Runs addo
.PHONY: tooltest
tooltest:
- @$(PYTHON) test/tools/test-js2c.py
+ @$(PYTHON) -m unittest discover -s ./test/tools
.PHONY: coverage-run-js
coverage-run-js:
diff --git a/README.md b/README.md
index aa5ca6d6595170..e200d25eb133d6 100644
--- a/README.md
+++ b/README.md
@@ -256,8 +256,6 @@ For information about the governance of the Node.js project, see
**Ben Noordhuis** <info@bnoordhuis.nl>
* [boneskull](https://github.com/boneskull) -
**Christopher Hiller** <boneskull@boneskull.com> (he/him)
-* [brendanashworth](https://github.com/brendanashworth) -
-**Brendan Ashworth** <brendan.ashworth@me.com>
* [BridgeAR](https://github.com/BridgeAR) -
**Ruben Bridgewater** <ruben@bridgewater.de> (he/him)
* [bzoz](https://github.com/bzoz) -
@@ -276,8 +274,6 @@ For information about the governance of the Node.js project, see
**Shelley Vohr** <codebytere@gmail.com> (she/her)
* [danbev](https://github.com/danbev) -
**Daniel Bevenius** <daniel.bevenius@gmail.com> (he/him)
-* [DavidCai1993](https://github.com/DavidCai1993) -
-**David Cai** <davidcai1993@yahoo.com> (he/him)
* [davisjam](https://github.com/davisjam) -
**Jamie Davis** <davisjam@vt.edu> (he/him)
* [devnexen](https://github.com/devnexen) -
@@ -318,8 +314,6 @@ For information about the governance of the Node.js project, see
**Yuta Hiroto** <hello@hiroppy.me> (he/him)
* [iarna](https://github.com/iarna) -
**Rebecca Turner** <me@re-becca.org>
-* [imyller](https://github.com/imyller) -
-**Ilkka Myller** <ilkka.myller@nodefield.com>
* [indutny](https://github.com/indutny) -
**Fedor Indutny** <fedor.indutny@gmail.com>
* [italoacasas](https://github.com/italoacasas) -
@@ -328,8 +322,6 @@ For information about the governance of the Node.js project, see
**Jackson Tian** <shyvo1987@gmail.com>
* [jasnell](https://github.com/jasnell) -
**James M Snell** <jasnell@gmail.com> (he/him)
-* [jasongin](https://github.com/jasongin) -
-**Jason Ginchereau** <jasongin@microsoft.com>
* [jbergstroem](https://github.com/jbergstroem) -
**Johan Bergström** <bugs@bergstroem.nu>
* [jdalton](https://github.com/jdalton) -
@@ -392,8 +384,6 @@ For information about the governance of the Node.js project, see
**Richard Lau** <riclau@uk.ibm.com>
* [ronkorving](https://github.com/ronkorving) -
**Ron Korving** <ron@ronkorving.nl>
-* [RReverser](https://github.com/RReverser) -
-**Ingvar Stepanyan** <me@rreverser.com>
* [rubys](https://github.com/rubys) -
**Sam Ruby** <rubys@intertwingly.net>
* [rvagg](https://github.com/rvagg) -
@@ -461,16 +451,24 @@ For information about the governance of the Node.js project, see
**Andras** <andras@kinvey.com>
* [AnnaMag](https://github.com/AnnaMag) -
**Anna M. Kedzierska** <anna.m.kedzierska@gmail.com>
+* [brendanashworth](https://github.com/brendanashworth) -
+**Brendan Ashworth** <brendan.ashworth@me.com>
* [estliberitas](https://github.com/estliberitas) -
**Alexander Makarenko** <estliberitas@gmail.com>
* [chrisdickinson](https://github.com/chrisdickinson) -
**Chris Dickinson** <christopher.s.dickinson@gmail.com>
+* [DavidCai1993](https://github.com/DavidCai1993) -
+**David Cai** <davidcai1993@yahoo.com> (he/him)
* [firedfox](https://github.com/firedfox) -
**Daniel Wang** <wangyang0123@gmail.com>
* [imran-iq](https://github.com/imran-iq) -
**Imran Iqbal** <imran@imraniqbal.org>
+* [imyller](https://github.com/imyller) -
+**Ilkka Myller** <ilkka.myller@nodefield.com>
* [isaacs](https://github.com/isaacs) -
**Isaac Z. Schlueter** <i@izs.me>
+* [jasongin](https://github.com/jasongin) -
+**Jason Ginchereau** <jasongin@microsoft.com>
* [jhamhader](https://github.com/jhamhader) -
**Yuval Brik** <yuval@brik.org.il>
* [joshgav](https://github.com/joshgav) -
@@ -511,6 +509,8 @@ For information about the governance of the Node.js project, see
**Robert Kowalski** <rok@kowalski.gd>
* [romankl](https://github.com/romankl) -
**Roman Klauke** <romaaan.git@gmail.com>
+* [RReverser](https://github.com/RReverser) -
+**Ingvar Stepanyan** <me@rreverser.com>
* [stefanmb](https://github.com/stefanmb) -
**Stefan Budeanu** <stefan@budeanu.com>
* [tellnes](https://github.com/tellnes) -
diff --git a/benchmark/assert/deepequal-buffer.js b/benchmark/assert/deepequal-buffer.js
index b8d7529ebc3291..6d9162f15173f9 100644
--- a/benchmark/assert/deepequal-buffer.js
+++ b/benchmark/assert/deepequal-buffer.js
@@ -27,7 +27,7 @@ function main({ len, n, method, strict }) {
const value2 = method.includes('not') ? expectedWrong : expected;
bench.start();
- for (var i = 0; i < n; ++i) {
+ for (let i = 0; i < n; ++i) {
fn(actual, value2);
}
bench.end(n);
diff --git a/benchmark/assert/deepequal-map.js b/benchmark/assert/deepequal-map.js
index ea1b73cec0e522..b88ecf7ce127f9 100644
--- a/benchmark/assert/deepequal-map.js
+++ b/benchmark/assert/deepequal-map.js
@@ -24,7 +24,7 @@ function benchmark(method, n, values, values2) {
const deepCopy = JSON.parse(JSON.stringify(values2 ? values2 : values));
const expected = new Map(deepCopy);
bench.start();
- for (var i = 0; i < n; ++i) {
+ for (let i = 0; i < n; ++i) {
method(actual, expected);
}
bench.end(n);
@@ -32,41 +32,50 @@ function benchmark(method, n, values, values2) {
function main({ n, len, method, strict }) {
const array = Array(len).fill(1);
- var values, values2;
switch (method) {
case '':
// Empty string falls through to next line as default, mostly for tests.
- case 'deepEqual_primitiveOnly':
- values = array.map((_, i) => [`str_${i}`, 123]);
+ case 'deepEqual_primitiveOnly': {
+ const values = array.map((_, i) => [`str_${i}`, 123]);
benchmark(strict ? deepStrictEqual : deepEqual, n, values);
break;
- case 'deepEqual_objectOnly':
- values = array.map((_, i) => [[`str_${i}`, 1], 123]);
+ }
+ case 'deepEqual_objectOnly': {
+ const values = array.map((_, i) => [[`str_${i}`, 1], 123]);
benchmark(strict ? deepStrictEqual : deepEqual, n, values);
break;
- case 'deepEqual_mixed':
- values = array.map((_, i) => [i % 2 ? [`str_${i}`, 1] : `str_${i}`, 123]);
+ }
+ case 'deepEqual_mixed': {
+ const values = array.map(
+ (_, i) => [i % 2 ? [`str_${i}`, 1] : `str_${i}`, 123]
+ );
benchmark(strict ? deepStrictEqual : deepEqual, n, values);
break;
- case 'notDeepEqual_primitiveOnly':
- values = array.map((_, i) => [`str_${i}`, 123]);
- values2 = values.slice(0);
+ }
+ case 'notDeepEqual_primitiveOnly': {
+ const values = array.map((_, i) => [`str_${i}`, 123]);
+ const values2 = values.slice(0);
values2[Math.floor(len / 2)] = ['w00t', 123];
benchmark(strict ? notDeepStrictEqual : notDeepEqual, n, values, values2);
break;
- case 'notDeepEqual_objectOnly':
- values = array.map((_, i) => [[`str_${i}`, 1], 123]);
- values2 = values.slice(0);
+ }
+ case 'notDeepEqual_objectOnly': {
+ const values = array.map((_, i) => [[`str_${i}`, 1], 123]);
+ const values2 = values.slice(0);
values2[Math.floor(len / 2)] = [['w00t'], 123];
benchmark(strict ? notDeepStrictEqual : notDeepEqual, n, values, values2);
break;
- case 'notDeepEqual_mixed':
- values = array.map((_, i) => [i % 2 ? [`str_${i}`, 1] : `str_${i}`, 123]);
- values2 = values.slice(0);
+ }
+ case 'notDeepEqual_mixed': {
+ const values = array.map(
+ (_, i) => [i % 2 ? [`str_${i}`, 1] : `str_${i}`, 123]
+ );
+ const values2 = values.slice(0);
values2[0] = ['w00t', 123];
benchmark(strict ? notDeepStrictEqual : notDeepEqual, n, values, values2);
break;
+ }
default:
throw new Error(`Unsupported method ${method}`);
}
diff --git a/benchmark/assert/deepequal-object.js b/benchmark/assert/deepequal-object.js
index 240da23d244039..e23f6692b3decd 100644
--- a/benchmark/assert/deepequal-object.js
+++ b/benchmark/assert/deepequal-object.js
@@ -42,7 +42,7 @@ function main({ size, n, method, strict }) {
const value2 = method.includes('not') ? expectedWrong : expected;
bench.start();
- for (var i = 0; i < n; ++i) {
+ for (let i = 0; i < n; ++i) {
fn(actual, value2);
}
bench.end(n);
diff --git a/benchmark/assert/deepequal-prims-and-objs-big-array-set.js b/benchmark/assert/deepequal-prims-and-objs-big-array-set.js
index 981ec3f0e90fac..0e0ce450bb1a98 100644
--- a/benchmark/assert/deepequal-prims-and-objs-big-array-set.js
+++ b/benchmark/assert/deepequal-prims-and-objs-big-array-set.js
@@ -26,7 +26,7 @@ const bench = common.createBenchmark(main, {
function run(fn, n, actual, expected) {
bench.start();
- for (var i = 0; i < n; ++i) {
+ for (let i = 0; i < n; ++i) {
fn(actual, expected);
}
bench.end(n);
@@ -38,7 +38,7 @@ function main({ n, len, primitive, method, strict }) {
const expected = [];
const expectedWrong = [];
- for (var x = 0; x < len; x++) {
+ for (let x = 0; x < len; x++) {
actual.push(prim);
expected.push(prim);
expectedWrong.push(prim);
diff --git a/benchmark/assert/deepequal-prims-and-objs-big-loop.js b/benchmark/assert/deepequal-prims-and-objs-big-loop.js
index 00b3c785a4dc71..32140f08ded6fb 100644
--- a/benchmark/assert/deepequal-prims-and-objs-big-loop.js
+++ b/benchmark/assert/deepequal-prims-and-objs-big-loop.js
@@ -31,7 +31,7 @@ function main({ n, primitive, method, strict }) {
const value2 = method.includes('not') ? expectedWrong : expected;
bench.start();
- for (var i = 0; i < n; ++i) {
+ for (let i = 0; i < n; ++i) {
fn([actual], [value2]);
}
bench.end(n);
diff --git a/benchmark/assert/deepequal-set.js b/benchmark/assert/deepequal-set.js
index b4406b2600f2b1..561a951e6834cc 100644
--- a/benchmark/assert/deepequal-set.js
+++ b/benchmark/assert/deepequal-set.js
@@ -24,7 +24,7 @@ function benchmark(method, n, values, values2) {
const deepCopy = JSON.parse(JSON.stringify(values2 ? values2 : values));
const expected = new Set(deepCopy);
bench.start();
- for (var i = 0; i < n; ++i) {
+ for (let i = 0; i < n; ++i) {
method(actual, expected);
}
bench.end(n);
@@ -33,45 +33,49 @@ function benchmark(method, n, values, values2) {
function main({ n, len, method, strict }) {
const array = Array(len).fill(1);
- var values, values2;
-
switch (method) {
case '':
// Empty string falls through to next line as default, mostly for tests.
- case 'deepEqual_primitiveOnly':
- values = array.map((_, i) => `str_${i}`);
+ case 'deepEqual_primitiveOnly': {
+ const values = array.map((_, i) => `str_${i}`);
benchmark(strict ? deepStrictEqual : deepEqual, n, values);
break;
- case 'deepEqual_objectOnly':
- values = array.map((_, i) => [`str_${i}`, null]);
+ }
+ case 'deepEqual_objectOnly': {
+ const values = array.map((_, i) => [`str_${i}`, null]);
benchmark(strict ? deepStrictEqual : deepEqual, n, values);
break;
- case 'deepEqual_mixed':
- values = array.map((_, i) => {
+ }
+ case 'deepEqual_mixed': {
+ const values = array.map((_, i) => {
return i % 2 ? [`str_${i}`, null] : `str_${i}`;
});
benchmark(strict ? deepStrictEqual : deepEqual, n, values);
break;
- case 'notDeepEqual_primitiveOnly':
- values = array.map((_, i) => `str_${i}`);
- values2 = values.slice(0);
+ }
+ case 'notDeepEqual_primitiveOnly': {
+ const values = array.map((_, i) => `str_${i}`);
+ const values2 = values.slice(0);
values2[Math.floor(len / 2)] = 'w00t';
benchmark(strict ? notDeepStrictEqual : notDeepEqual, n, values, values2);
break;
- case 'notDeepEqual_objectOnly':
- values = array.map((_, i) => [`str_${i}`, null]);
- values2 = values.slice(0);
+ }
+ case 'notDeepEqual_objectOnly': {
+ const values = array.map((_, i) => [`str_${i}`, null]);
+ const values2 = values.slice(0);
values2[Math.floor(len / 2)] = ['w00t'];
benchmark(strict ? notDeepStrictEqual : notDeepEqual, n, values, values2);
break;
- case 'notDeepEqual_mixed':
- values = array.map((_, i) => {
+ }
+ case 'notDeepEqual_mixed': {
+ const values = array.map((_, i) => {
return i % 2 ? [`str_${i}`, null] : `str_${i}`;
});
- values2 = values.slice();
+ const values2 = values.slice();
values2[0] = 'w00t';
benchmark(strict ? notDeepStrictEqual : notDeepEqual, n, values, values2);
break;
+ }
default:
throw new Error(`Unsupported method "${method}"`);
}
diff --git a/benchmark/assert/deepequal-typedarrays.js b/benchmark/assert/deepequal-typedarrays.js
index 9acf83711efb0d..10ba21a25759e2 100644
--- a/benchmark/assert/deepequal-typedarrays.js
+++ b/benchmark/assert/deepequal-typedarrays.js
@@ -36,7 +36,7 @@ function main({ type, n, len, method, strict }) {
const value2 = method.includes('not') ? expectedWrong : expected;
bench.start();
- for (var i = 0; i < n; ++i) {
+ for (let i = 0; i < n; ++i) {
actual[0] = i;
value2[0] = i;
fn(actual, value2);
diff --git a/benchmark/assert/ok.js b/benchmark/assert/ok.js
index c50c0e069f42cf..42fd2e89b78d1e 100644
--- a/benchmark/assert/ok.js
+++ b/benchmark/assert/ok.js
@@ -6,9 +6,8 @@ const assert = require('assert');
const bench = common.createBenchmark(main, { n: [1e5] });
function main({ n }) {
- var i;
bench.start();
- for (i = 0; i < n; ++i) {
+ for (let i = 0; i < n; ++i) {
if (i % 2 === 0)
assert(true);
else
diff --git a/benchmark/assert/throws.js b/benchmark/assert/throws.js
index 3a6326371dc872..c80518377a8742 100644
--- a/benchmark/assert/throws.js
+++ b/benchmark/assert/throws.js
@@ -13,28 +13,27 @@ function main({ n, method }) {
const doNotThrowError = () => { return 'foobar'; };
const regExp = /foobar/;
const message = 'failure';
- var i;
switch (method) {
case '':
// Empty string falls through to next line as default, mostly for tests.
case 'doesNotThrow':
bench.start();
- for (i = 0; i < n; ++i) {
+ for (let i = 0; i < n; ++i) {
doesNotThrow(doNotThrowError);
}
bench.end(n);
break;
case 'throws_TypeError':
bench.start();
- for (i = 0; i < n; ++i) {
+ for (let i = 0; i < n; ++i) {
throws(throwError, TypeError, message);
}
bench.end(n);
break;
case 'throws_RegExp':
bench.start();
- for (i = 0; i < n; ++i) {
+ for (let i = 0; i < n; ++i) {
throws(throwError, regExp, message);
}
bench.end(n);
diff --git a/benchmark/async_hooks/gc-tracking.js b/benchmark/async_hooks/gc-tracking.js
index d74b2bac463e28..030b5f8e1934f8 100644
--- a/benchmark/async_hooks/gc-tracking.js
+++ b/benchmark/async_hooks/gc-tracking.js
@@ -22,18 +22,17 @@ function endAfterGC(n) {
}
function main({ n, method }) {
- var i;
switch (method) {
case 'trackingEnabled':
bench.start();
- for (i = 0; i < n; i++) {
+ for (let i = 0; i < n; i++) {
new AsyncResource('foobar');
}
endAfterGC(n);
break;
case 'trackingDisabled':
bench.start();
- for (i = 0; i < n; i++) {
+ for (let i = 0; i < n; i++) {
new AsyncResource('foobar', { requireManualDestroy: true });
}
endAfterGC(n);
diff --git a/benchmark/cluster/echo.js b/benchmark/cluster/echo.js
index 73c5971cd41eb2..152f2c42f10f2b 100644
--- a/benchmark/cluster/echo.js
+++ b/benchmark/cluster/echo.js
@@ -7,16 +7,25 @@ if (cluster.isMaster) {
workers: [1],
payload: ['string', 'object'],
sendsPerBroadcast: [1, 10],
+ serialization: ['json', 'advanced'],
n: [1e5]
});
- function main({ n, workers, sendsPerBroadcast, payload }) {
+ function main({
+ n,
+ workers,
+ sendsPerBroadcast,
+ payload,
+ serialization
+ }) {
const expectedPerBroadcast = sendsPerBroadcast * workers;
var readies = 0;
var broadcasts = 0;
var msgCount = 0;
var data;
+ cluster.settings.serialization = serialization;
+
switch (payload) {
case 'string':
data = 'hello world!';
diff --git a/common.gypi b/common.gypi
index b5df26fd2be34f..2e59636b1718f1 100644
--- a/common.gypi
+++ b/common.gypi
@@ -39,13 +39,10 @@
# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
- 'v8_embedder_string': '-node.19',
+ 'v8_embedder_string': '-node.20',
##### V8 defaults for Node.js #####
- # Old time default, now explicitly stated.
- 'v8_use_snapshot': 1,
-
# Turn on SipHash for hash seed generation, addresses HashWick
'v8_use_siphash': 'true',
@@ -76,52 +73,27 @@
# TODO(refack): make v8-perfetto happen
'v8_use_perfetto': 0,
+ 'v8_enable_pointer_compression': 0,
+ 'v8_enable_31bit_smis_on_64bit_arch': 0,
+
##### end V8 defaults #####
'conditions': [
['OS == "win"', {
'os_posix': 0,
'v8_postmortem_support%': 0,
+ 'obj_dir': '<(PRODUCT_DIR)/obj',
+ 'v8_base': '<(PRODUCT_DIR)/lib/libv8_snapshot.a',
}, {
'os_posix': 1,
'v8_postmortem_support%': 1,
}],
- ['v8_use_snapshot==1', {
- 'conditions': [
- ['GENERATOR == "ninja"', {
- 'obj_dir': '<(PRODUCT_DIR)/obj',
- 'v8_base': '<(PRODUCT_DIR)/obj/tools/v8_gypfiles/libv8_snapshot.a',
- }, {
- 'obj_dir%': '<(PRODUCT_DIR)/obj.target',
- 'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_snapshot.a',
- }],
- ['OS == "win"', {
- 'obj_dir': '<(PRODUCT_DIR)/obj',
- 'v8_base': '<(PRODUCT_DIR)/lib/libv8_snapshot.a',
- }],
- ['OS == "mac"', {
- 'obj_dir%': '<(PRODUCT_DIR)/obj.target',
- 'v8_base': '<(PRODUCT_DIR)/libv8_snapshot.a',
- }],
- ],
+ ['GENERATOR == "ninja"', {
+ 'obj_dir': '<(PRODUCT_DIR)/obj',
+ 'v8_base': '<(PRODUCT_DIR)/obj/tools/v8_gypfiles/libv8_snapshot.a',
}, {
- 'conditions': [
- ['GENERATOR == "ninja"', {
- 'obj_dir': '<(PRODUCT_DIR)/obj',
- 'v8_base': '<(PRODUCT_DIR)/obj/tools/v8_gypfiles/libv8_nosnapshot.a',
- }, {
- 'obj_dir%': '<(PRODUCT_DIR)/obj.target',
- 'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_nosnapshot.a',
- }],
- ['OS == "win"', {
- 'obj_dir': '<(PRODUCT_DIR)/obj',
- 'v8_base': '<(PRODUCT_DIR)/lib/libv8_nosnapshot.a',
- }],
- ['OS == "mac"', {
- 'obj_dir%': '<(PRODUCT_DIR)/obj.target',
- 'v8_base': '<(PRODUCT_DIR)/libv8_nosnapshot.a',
- }],
- ],
+ 'obj_dir%': '<(PRODUCT_DIR)/obj.target',
+ 'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_snapshot.a',
}],
['openssl_fips != ""', {
'openssl_product': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)',
@@ -130,6 +102,8 @@
}],
['OS=="mac"', {
'clang%': 1,
+ 'obj_dir%': '<(PRODUCT_DIR)/obj.target',
+ 'v8_base': '<(PRODUCT_DIR)/libv8_snapshot.a',
}],
],
},
@@ -334,6 +308,12 @@
}],
],
}],
+ ['v8_enable_pointer_compression == 1', {
+ 'defines': ['V8_COMPRESS_POINTERS'],
+ }],
+ ['v8_enable_pointer_compression == 1 or v8_enable_31bit_smis_on_64bit_arch == 1', {
+ 'defines': ['V8_31BIT_SMIS_ON_64BIT_ARCH'],
+ }],
['OS == "win"', {
'defines': [
'WIN32',
diff --git a/deps/icu-small/source/data/in/icudt64l.dat.bz2 b/deps/icu-small/source/data/in/icudt64l.dat.bz2
index 5676ffb70f8b9d..962fe59750de58 100644
Binary files a/deps/icu-small/source/data/in/icudt64l.dat.bz2 and b/deps/icu-small/source/data/in/icudt64l.dat.bz2 differ
diff --git a/deps/nghttp2/lib/CMakeLists.txt b/deps/nghttp2/lib/CMakeLists.txt
index c27ee99bb7fa46..4e3f5da0f9f00a 100644
--- a/deps/nghttp2/lib/CMakeLists.txt
+++ b/deps/nghttp2/lib/CMakeLists.txt
@@ -62,7 +62,7 @@ if(HAVE_CUNIT OR ENABLE_STATIC_LIB)
set_target_properties(nghttp2_static PROPERTIES
COMPILE_FLAGS "${WARNCFLAGS}"
VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION}
- ARCHIVE_OUTPUT_NAME nghttp2
+ ARCHIVE_OUTPUT_NAME nghttp2_static
)
target_compile_definitions(nghttp2_static PUBLIC "-DNGHTTP2_STATICLIB")
if(ENABLE_STATIC_LIB)
diff --git a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
index 313fb23daa7449..e3aeb9fed31ecc 100644
--- a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
+++ b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
@@ -4769,6 +4769,19 @@ NGHTTP2_EXTERN int nghttp2_check_header_name(const uint8_t *name, size_t len);
*/
NGHTTP2_EXTERN int nghttp2_check_header_value(const uint8_t *value, size_t len);
+/**
+ * @function
+ *
+ * Returns nonzero if the |value| which is supposed to the value of
+ * :authority or host header field is valid according to
+ * https://tools.ietf.org/html/rfc3986#section-3.2
+ *
+ * |value| is valid if it merely consists of the allowed characters.
+ * In particular, it does not check whether |value| follows the syntax
+ * of authority.
+ */
+NGHTTP2_EXTERN int nghttp2_check_authority(const uint8_t *value, size_t len);
+
/* HPACK API */
struct nghttp2_hd_deflater;
diff --git a/deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h b/deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h
index 45bb0c9102cb05..45d21e2645c6cf 100644
--- a/deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h
+++ b/deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h
@@ -29,7 +29,7 @@
* @macro
* Version number of the nghttp2 library release
*/
-#define NGHTTP2_VERSION "1.39.2"
+#define NGHTTP2_VERSION "1.40.0"
/**
* @macro
@@ -37,6 +37,6 @@
* release. This is a 24 bit number with 8 bits for major number, 8 bits
* for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
*/
-#define NGHTTP2_VERSION_NUM 0x012702
+#define NGHTTP2_VERSION_NUM 0x012800
#endif /* NGHTTP2VER_H */
diff --git a/deps/nghttp2/lib/nghttp2_hd.c b/deps/nghttp2/lib/nghttp2_hd.c
index 11ca3345f3c6b3..5e869315259921 100644
--- a/deps/nghttp2/lib/nghttp2_hd.c
+++ b/deps/nghttp2/lib/nghttp2_hd.c
@@ -1694,6 +1694,11 @@ static ssize_t hd_inflate_read_huff(nghttp2_hd_inflater *inflater,
DEBUGF("inflatehd: huffman decoding failed\n");
return readlen;
}
+ if (nghttp2_hd_huff_decode_failure_state(&inflater->huff_decode_ctx)) {
+ DEBUGF("inflatehd: huffman decoding failed\n");
+ return NGHTTP2_ERR_HEADER_COMP;
+ }
+
inflater->left -= (size_t)readlen;
return readlen;
}
diff --git a/deps/nghttp2/lib/nghttp2_hd.h b/deps/nghttp2/lib/nghttp2_hd.h
index 14ae98078957af..267402881f4258 100644
--- a/deps/nghttp2/lib/nghttp2_hd.h
+++ b/deps/nghttp2/lib/nghttp2_hd.h
@@ -430,4 +430,10 @@ ssize_t nghttp2_hd_huff_decode(nghttp2_hd_huff_decode_context *ctx,
nghttp2_buf *buf, const uint8_t *src,
size_t srclen, int fin);
+/*
+ * nghttp2_hd_huff_decode_failure_state returns nonzero if |ctx|
+ * indicates that huffman decoding context is in failure state.
+ */
+int nghttp2_hd_huff_decode_failure_state(nghttp2_hd_huff_decode_context *ctx);
+
#endif /* NGHTTP2_HD_H */
diff --git a/deps/nghttp2/lib/nghttp2_hd_huffman.c b/deps/nghttp2/lib/nghttp2_hd_huffman.c
index 8881aacb2e6e90..ac90f49c44f147 100644
--- a/deps/nghttp2/lib/nghttp2_hd_huffman.c
+++ b/deps/nghttp2/lib/nghttp2_hd_huffman.c
@@ -29,114 +29,7 @@
#include
#include "nghttp2_hd.h"
-
-/*
- * Encodes huffman code |sym| into |*dest_ptr|, whose least |rembits|
- * bits are not filled yet. The |rembits| must be in range [1, 8],
- * inclusive. At the end of the process, the |*dest_ptr| is updated
- * and points where next output should be placed. The number of
- * unfilled bits in the pointed location is returned.
- */
-static ssize_t huff_encode_sym(nghttp2_bufs *bufs, size_t *avail_ptr,
- size_t rembits, const nghttp2_huff_sym *sym) {
- int rv;
- size_t nbits = sym->nbits;
- uint32_t code = sym->code;
-
- /* We assume that sym->nbits <= 32 */
- if (rembits > nbits) {
- nghttp2_bufs_fast_orb_hold(bufs, (uint8_t)(code << (rembits - nbits)));
- return (ssize_t)(rembits - nbits);
- }
-
- if (rembits == nbits) {
- nghttp2_bufs_fast_orb(bufs, (uint8_t)code);
- --*avail_ptr;
- return 8;
- }
-
- nghttp2_bufs_fast_orb(bufs, (uint8_t)(code >> (nbits - rembits)));
- --*avail_ptr;
-
- nbits -= rembits;
- if (nbits & 0x7) {
- /* align code to MSB byte boundary */
- code <<= 8 - (nbits & 0x7);
- }
-
- if (*avail_ptr < (nbits + 7) / 8) {
- /* slow path */
- if (nbits > 24) {
- rv = nghttp2_bufs_addb(bufs, (uint8_t)(code >> 24));
- if (rv != 0) {
- return rv;
- }
- nbits -= 8;
- }
- if (nbits > 16) {
- rv = nghttp2_bufs_addb(bufs, (uint8_t)(code >> 16));
- if (rv != 0) {
- return rv;
- }
- nbits -= 8;
- }
- if (nbits > 8) {
- rv = nghttp2_bufs_addb(bufs, (uint8_t)(code >> 8));
- if (rv != 0) {
- return rv;
- }
- nbits -= 8;
- }
- if (nbits == 8) {
- rv = nghttp2_bufs_addb(bufs, (uint8_t)code);
- if (rv != 0) {
- return rv;
- }
- *avail_ptr = nghttp2_bufs_cur_avail(bufs);
- return 8;
- }
-
- rv = nghttp2_bufs_addb_hold(bufs, (uint8_t)code);
- if (rv != 0) {
- return rv;
- }
- *avail_ptr = nghttp2_bufs_cur_avail(bufs);
- return (ssize_t)(8 - nbits);
- }
-
- /* fast path, since most code is less than 8 */
- if (nbits < 8) {
- nghttp2_bufs_fast_addb_hold(bufs, (uint8_t)code);
- *avail_ptr = nghttp2_bufs_cur_avail(bufs);
- return (ssize_t)(8 - nbits);
- }
-
- /* handle longer code path */
- if (nbits > 24) {
- nghttp2_bufs_fast_addb(bufs, (uint8_t)(code >> 24));
- nbits -= 8;
- }
-
- if (nbits > 16) {
- nghttp2_bufs_fast_addb(bufs, (uint8_t)(code >> 16));
- nbits -= 8;
- }
-
- if (nbits > 8) {
- nghttp2_bufs_fast_addb(bufs, (uint8_t)(code >> 8));
- nbits -= 8;
- }
-
- if (nbits == 8) {
- nghttp2_bufs_fast_addb(bufs, (uint8_t)code);
- *avail_ptr = nghttp2_bufs_cur_avail(bufs);
- return 8;
- }
-
- nghttp2_bufs_fast_addb_hold(bufs, (uint8_t)code);
- *avail_ptr = nghttp2_bufs_cur_avail(bufs);
- return (ssize_t)(8 - nbits);
-}
+#include "nghttp2_net.h"
size_t nghttp2_hd_huff_encode_count(const uint8_t *src, size_t len) {
size_t i;
@@ -151,81 +44,101 @@ size_t nghttp2_hd_huff_encode_count(const uint8_t *src, size_t len) {
int nghttp2_hd_huff_encode(nghttp2_bufs *bufs, const uint8_t *src,
size_t srclen) {
- int rv;
- ssize_t rembits = 8;
- size_t i;
+ const nghttp2_huff_sym *sym;
+ const uint8_t *end = src + srclen;
+ uint64_t code = 0;
+ uint32_t x;
+ size_t nbits = 0;
size_t avail;
+ int rv;
avail = nghttp2_bufs_cur_avail(bufs);
- for (i = 0; i < srclen; ++i) {
- const nghttp2_huff_sym *sym = &huff_sym_table[src[i]];
- if (rembits == 8) {
- if (avail) {
- nghttp2_bufs_fast_addb_hold(bufs, 0);
- } else {
- rv = nghttp2_bufs_addb_hold(bufs, 0);
- if (rv != 0) {
- return rv;
- }
- avail = nghttp2_bufs_cur_avail(bufs);
+ for (; src != end;) {
+ sym = &huff_sym_table[*src++];
+ code |= (uint64_t)sym->code << (32 - nbits);
+ nbits += sym->nbits;
+ if (nbits < 32) {
+ continue;
+ }
+ if (avail >= 4) {
+ x = htonl((uint32_t)(code >> 32));
+ memcpy(bufs->cur->buf.last, &x, 4);
+ bufs->cur->buf.last += 4;
+ avail -= 4;
+ code <<= 32;
+ nbits -= 32;
+ continue;
+ }
+
+ for (; nbits >= 8;) {
+ rv = nghttp2_bufs_addb(bufs, (uint8_t)(code >> 56));
+ if (rv != 0) {
+ return rv;
}
+ code <<= 8;
+ nbits -= 8;
}
- rembits = huff_encode_sym(bufs, &avail, (size_t)rembits, sym);
- if (rembits < 0) {
- return (int)rembits;
+
+ avail = nghttp2_bufs_cur_avail(bufs);
+ }
+
+ for (; nbits >= 8;) {
+ rv = nghttp2_bufs_addb(bufs, (uint8_t)(code >> 56));
+ if (rv != 0) {
+ return rv;
}
+ code <<= 8;
+ nbits -= 8;
}
- /* 256 is special terminal symbol, pad with its prefix */
- if (rembits < 8) {
- /* if rembits < 8, we should have at least 1 buffer space
- available */
- const nghttp2_huff_sym *sym = &huff_sym_table[256];
- assert(avail);
- /* Caution we no longer adjust avail here */
- nghttp2_bufs_fast_orb(
- bufs, (uint8_t)(sym->code >> (sym->nbits - (size_t)rembits)));
+
+ if (nbits) {
+ rv = nghttp2_bufs_addb(
+ bufs, (uint8_t)((uint8_t)(code >> 56) | ((1 << (8 - nbits)) - 1)));
+ if (rv != 0) {
+ return rv;
+ }
}
return 0;
}
void nghttp2_hd_huff_decode_context_init(nghttp2_hd_huff_decode_context *ctx) {
- ctx->state = 0;
- ctx->accept = 1;
+ ctx->fstate = NGHTTP2_HUFF_ACCEPTED;
}
ssize_t nghttp2_hd_huff_decode(nghttp2_hd_huff_decode_context *ctx,
nghttp2_buf *buf, const uint8_t *src,
size_t srclen, int final) {
- size_t i;
+ const uint8_t *end = src + srclen;
+ nghttp2_huff_decode node = {ctx->fstate, 0};
+ const nghttp2_huff_decode *t = &node;
+ uint8_t c;
/* We use the decoding algorithm described in
http://graphics.ics.uci.edu/pub/Prefix.pdf */
- for (i = 0; i < srclen; ++i) {
- const nghttp2_huff_decode *t;
-
- t = &huff_decode_table[ctx->state][src[i] >> 4];
- if (t->flags & NGHTTP2_HUFF_FAIL) {
- return NGHTTP2_ERR_HEADER_COMP;
- }
- if (t->flags & NGHTTP2_HUFF_SYM) {
+ for (; src != end;) {
+ c = *src++;
+ t = &huff_decode_table[t->fstate & 0x1ff][c >> 4];
+ if (t->fstate & NGHTTP2_HUFF_SYM) {
*buf->last++ = t->sym;
}
- t = &huff_decode_table[t->state][src[i] & 0xf];
- if (t->flags & NGHTTP2_HUFF_FAIL) {
- return NGHTTP2_ERR_HEADER_COMP;
- }
- if (t->flags & NGHTTP2_HUFF_SYM) {
+ t = &huff_decode_table[t->fstate & 0x1ff][c & 0xf];
+ if (t->fstate & NGHTTP2_HUFF_SYM) {
*buf->last++ = t->sym;
}
-
- ctx->state = t->state;
- ctx->accept = (t->flags & NGHTTP2_HUFF_ACCEPTED) != 0;
}
- if (final && !ctx->accept) {
+
+ ctx->fstate = t->fstate;
+
+ if (final && !(ctx->fstate & NGHTTP2_HUFF_ACCEPTED)) {
return NGHTTP2_ERR_HEADER_COMP;
}
- return (ssize_t)i;
+
+ return (ssize_t)srclen;
+}
+
+int nghttp2_hd_huff_decode_failure_state(nghttp2_hd_huff_decode_context *ctx) {
+ return ctx->fstate == 0x100;
}
diff --git a/deps/nghttp2/lib/nghttp2_hd_huffman.h b/deps/nghttp2/lib/nghttp2_hd_huffman.h
index c6e3942e95f4fc..2bfd5318165f28 100644
--- a/deps/nghttp2/lib/nghttp2_hd_huffman.h
+++ b/deps/nghttp2/lib/nghttp2_hd_huffman.h
@@ -34,21 +34,20 @@
typedef enum {
/* FSA accepts this state as the end of huffman encoding
sequence. */
- NGHTTP2_HUFF_ACCEPTED = 1,
+ NGHTTP2_HUFF_ACCEPTED = 1 << 14,
/* This state emits symbol */
- NGHTTP2_HUFF_SYM = (1 << 1),
- /* If state machine reaches this state, decoding fails. */
- NGHTTP2_HUFF_FAIL = (1 << 2)
+ NGHTTP2_HUFF_SYM = 1 << 15,
} nghttp2_huff_decode_flag;
typedef struct {
- /* huffman decoding state, which is actually the node ID of internal
- huffman tree. We have 257 leaf nodes, but they are identical to
- root node other than emitting a symbol, so we have 256 internal
- nodes [1..255], inclusive. */
- uint8_t state;
- /* bitwise OR of zero or more of the nghttp2_huff_decode_flag */
- uint8_t flags;
+ /* fstate is the current huffman decoding state, which is actually
+ the node ID of internal huffman tree with
+ nghttp2_huff_decode_flag OR-ed. We have 257 leaf nodes, but they
+ are identical to root node other than emitting a symbol, so we
+ have 256 internal nodes [1..255], inclusive. The node ID 256 is
+ a special node and it is a terminal state that means decoding
+ failed. */
+ uint16_t fstate;
/* symbol if NGHTTP2_HUFF_SYM flag set */
uint8_t sym;
} nghttp2_huff_decode;
@@ -56,12 +55,8 @@ typedef struct {
typedef nghttp2_huff_decode huff_decode_table_type[16];
typedef struct {
- /* Current huffman decoding state. We stripped leaf nodes, so the
- value range is [0..255], inclusive. */
- uint8_t state;
- /* nonzero if we can say that the decoding process succeeds at this
- state */
- uint8_t accept;
+ /* fstate is the current huffman decoding state. */
+ uint16_t fstate;
} nghttp2_hd_huff_decode_context;
typedef struct {
diff --git a/deps/nghttp2/lib/nghttp2_hd_huffman_data.c b/deps/nghttp2/lib/nghttp2_hd_huffman_data.c
index 5ef4a956b93891..2e2e13f7bee0ff 100644
--- a/deps/nghttp2/lib/nghttp2_hd_huffman_data.c
+++ b/deps/nghttp2/lib/nghttp2_hd_huffman_data.c
@@ -27,4935 +27,4954 @@
/* Generated by mkhufftbl.py */
const nghttp2_huff_sym huff_sym_table[] = {
- {13, 0x1ff8u}, {23, 0x7fffd8u}, {28, 0xfffffe2u}, {28, 0xfffffe3u},
- {28, 0xfffffe4u}, {28, 0xfffffe5u}, {28, 0xfffffe6u}, {28, 0xfffffe7u},
- {28, 0xfffffe8u}, {24, 0xffffeau}, {30, 0x3ffffffcu}, {28, 0xfffffe9u},
- {28, 0xfffffeau}, {30, 0x3ffffffdu}, {28, 0xfffffebu}, {28, 0xfffffecu},
- {28, 0xfffffedu}, {28, 0xfffffeeu}, {28, 0xfffffefu}, {28, 0xffffff0u},
- {28, 0xffffff1u}, {28, 0xffffff2u}, {30, 0x3ffffffeu}, {28, 0xffffff3u},
- {28, 0xffffff4u}, {28, 0xffffff5u}, {28, 0xffffff6u}, {28, 0xffffff7u},
- {28, 0xffffff8u}, {28, 0xffffff9u}, {28, 0xffffffau}, {28, 0xffffffbu},
- {6, 0x14u}, {10, 0x3f8u}, {10, 0x3f9u}, {12, 0xffau},
- {13, 0x1ff9u}, {6, 0x15u}, {8, 0xf8u}, {11, 0x7fau},
- {10, 0x3fau}, {10, 0x3fbu}, {8, 0xf9u}, {11, 0x7fbu},
- {8, 0xfau}, {6, 0x16u}, {6, 0x17u}, {6, 0x18u},
- {5, 0x0u}, {5, 0x1u}, {5, 0x2u}, {6, 0x19u},
- {6, 0x1au}, {6, 0x1bu}, {6, 0x1cu}, {6, 0x1du},
- {6, 0x1eu}, {6, 0x1fu}, {7, 0x5cu}, {8, 0xfbu},
- {15, 0x7ffcu}, {6, 0x20u}, {12, 0xffbu}, {10, 0x3fcu},
- {13, 0x1ffau}, {6, 0x21u}, {7, 0x5du}, {7, 0x5eu},
- {7, 0x5fu}, {7, 0x60u}, {7, 0x61u}, {7, 0x62u},
- {7, 0x63u}, {7, 0x64u}, {7, 0x65u}, {7, 0x66u},
- {7, 0x67u}, {7, 0x68u}, {7, 0x69u}, {7, 0x6au},
- {7, 0x6bu}, {7, 0x6cu}, {7, 0x6du}, {7, 0x6eu},
- {7, 0x6fu}, {7, 0x70u}, {7, 0x71u}, {7, 0x72u},
- {8, 0xfcu}, {7, 0x73u}, {8, 0xfdu}, {13, 0x1ffbu},
- {19, 0x7fff0u}, {13, 0x1ffcu}, {14, 0x3ffcu}, {6, 0x22u},
- {15, 0x7ffdu}, {5, 0x3u}, {6, 0x23u}, {5, 0x4u},
- {6, 0x24u}, {5, 0x5u}, {6, 0x25u}, {6, 0x26u},
- {6, 0x27u}, {5, 0x6u}, {7, 0x74u}, {7, 0x75u},
- {6, 0x28u}, {6, 0x29u}, {6, 0x2au}, {5, 0x7u},
- {6, 0x2bu}, {7, 0x76u}, {6, 0x2cu}, {5, 0x8u},
- {5, 0x9u}, {6, 0x2du}, {7, 0x77u}, {7, 0x78u},
- {7, 0x79u}, {7, 0x7au}, {7, 0x7bu}, {15, 0x7ffeu},
- {11, 0x7fcu}, {14, 0x3ffdu}, {13, 0x1ffdu}, {28, 0xffffffcu},
- {20, 0xfffe6u}, {22, 0x3fffd2u}, {20, 0xfffe7u}, {20, 0xfffe8u},
- {22, 0x3fffd3u}, {22, 0x3fffd4u}, {22, 0x3fffd5u}, {23, 0x7fffd9u},
- {22, 0x3fffd6u}, {23, 0x7fffdau}, {23, 0x7fffdbu}, {23, 0x7fffdcu},
- {23, 0x7fffddu}, {23, 0x7fffdeu}, {24, 0xffffebu}, {23, 0x7fffdfu},
- {24, 0xffffecu}, {24, 0xffffedu}, {22, 0x3fffd7u}, {23, 0x7fffe0u},
- {24, 0xffffeeu}, {23, 0x7fffe1u}, {23, 0x7fffe2u}, {23, 0x7fffe3u},
- {23, 0x7fffe4u}, {21, 0x1fffdcu}, {22, 0x3fffd8u}, {23, 0x7fffe5u},
- {22, 0x3fffd9u}, {23, 0x7fffe6u}, {23, 0x7fffe7u}, {24, 0xffffefu},
- {22, 0x3fffdau}, {21, 0x1fffddu}, {20, 0xfffe9u}, {22, 0x3fffdbu},
- {22, 0x3fffdcu}, {23, 0x7fffe8u}, {23, 0x7fffe9u}, {21, 0x1fffdeu},
- {23, 0x7fffeau}, {22, 0x3fffddu}, {22, 0x3fffdeu}, {24, 0xfffff0u},
- {21, 0x1fffdfu}, {22, 0x3fffdfu}, {23, 0x7fffebu}, {23, 0x7fffecu},
- {21, 0x1fffe0u}, {21, 0x1fffe1u}, {22, 0x3fffe0u}, {21, 0x1fffe2u},
- {23, 0x7fffedu}, {22, 0x3fffe1u}, {23, 0x7fffeeu}, {23, 0x7fffefu},
- {20, 0xfffeau}, {22, 0x3fffe2u}, {22, 0x3fffe3u}, {22, 0x3fffe4u},
- {23, 0x7ffff0u}, {22, 0x3fffe5u}, {22, 0x3fffe6u}, {23, 0x7ffff1u},
- {26, 0x3ffffe0u}, {26, 0x3ffffe1u}, {20, 0xfffebu}, {19, 0x7fff1u},
- {22, 0x3fffe7u}, {23, 0x7ffff2u}, {22, 0x3fffe8u}, {25, 0x1ffffecu},
- {26, 0x3ffffe2u}, {26, 0x3ffffe3u}, {26, 0x3ffffe4u}, {27, 0x7ffffdeu},
- {27, 0x7ffffdfu}, {26, 0x3ffffe5u}, {24, 0xfffff1u}, {25, 0x1ffffedu},
- {19, 0x7fff2u}, {21, 0x1fffe3u}, {26, 0x3ffffe6u}, {27, 0x7ffffe0u},
- {27, 0x7ffffe1u}, {26, 0x3ffffe7u}, {27, 0x7ffffe2u}, {24, 0xfffff2u},
- {21, 0x1fffe4u}, {21, 0x1fffe5u}, {26, 0x3ffffe8u}, {26, 0x3ffffe9u},
- {28, 0xffffffdu}, {27, 0x7ffffe3u}, {27, 0x7ffffe4u}, {27, 0x7ffffe5u},
- {20, 0xfffecu}, {24, 0xfffff3u}, {20, 0xfffedu}, {21, 0x1fffe6u},
- {22, 0x3fffe9u}, {21, 0x1fffe7u}, {21, 0x1fffe8u}, {23, 0x7ffff3u},
- {22, 0x3fffeau}, {22, 0x3fffebu}, {25, 0x1ffffeeu}, {25, 0x1ffffefu},
- {24, 0xfffff4u}, {24, 0xfffff5u}, {26, 0x3ffffeau}, {23, 0x7ffff4u},
- {26, 0x3ffffebu}, {27, 0x7ffffe6u}, {26, 0x3ffffecu}, {26, 0x3ffffedu},
- {27, 0x7ffffe7u}, {27, 0x7ffffe8u}, {27, 0x7ffffe9u}, {27, 0x7ffffeau},
- {27, 0x7ffffebu}, {28, 0xffffffeu}, {27, 0x7ffffecu}, {27, 0x7ffffedu},
- {27, 0x7ffffeeu}, {27, 0x7ffffefu}, {27, 0x7fffff0u}, {26, 0x3ffffeeu},
- {30, 0x3fffffffu}};
+ {13, 0xffc00000u}, {23, 0xffffb000u}, {28, 0xfffffe20u}, {28, 0xfffffe30u},
+ {28, 0xfffffe40u}, {28, 0xfffffe50u}, {28, 0xfffffe60u}, {28, 0xfffffe70u},
+ {28, 0xfffffe80u}, {24, 0xffffea00u}, {30, 0xfffffff0u}, {28, 0xfffffe90u},
+ {28, 0xfffffea0u}, {30, 0xfffffff4u}, {28, 0xfffffeb0u}, {28, 0xfffffec0u},
+ {28, 0xfffffed0u}, {28, 0xfffffee0u}, {28, 0xfffffef0u}, {28, 0xffffff00u},
+ {28, 0xffffff10u}, {28, 0xffffff20u}, {30, 0xfffffff8u}, {28, 0xffffff30u},
+ {28, 0xffffff40u}, {28, 0xffffff50u}, {28, 0xffffff60u}, {28, 0xffffff70u},
+ {28, 0xffffff80u}, {28, 0xffffff90u}, {28, 0xffffffa0u}, {28, 0xffffffb0u},
+ {6, 0x50000000u}, {10, 0xfe000000u}, {10, 0xfe400000u}, {12, 0xffa00000u},
+ {13, 0xffc80000u}, {6, 0x54000000u}, {8, 0xf8000000u}, {11, 0xff400000u},
+ {10, 0xfe800000u}, {10, 0xfec00000u}, {8, 0xf9000000u}, {11, 0xff600000u},
+ {8, 0xfa000000u}, {6, 0x58000000u}, {6, 0x5c000000u}, {6, 0x60000000u},
+ {5, 0x0u}, {5, 0x8000000u}, {5, 0x10000000u}, {6, 0x64000000u},
+ {6, 0x68000000u}, {6, 0x6c000000u}, {6, 0x70000000u}, {6, 0x74000000u},
+ {6, 0x78000000u}, {6, 0x7c000000u}, {7, 0xb8000000u}, {8, 0xfb000000u},
+ {15, 0xfff80000u}, {6, 0x80000000u}, {12, 0xffb00000u}, {10, 0xff000000u},
+ {13, 0xffd00000u}, {6, 0x84000000u}, {7, 0xba000000u}, {7, 0xbc000000u},
+ {7, 0xbe000000u}, {7, 0xc0000000u}, {7, 0xc2000000u}, {7, 0xc4000000u},
+ {7, 0xc6000000u}, {7, 0xc8000000u}, {7, 0xca000000u}, {7, 0xcc000000u},
+ {7, 0xce000000u}, {7, 0xd0000000u}, {7, 0xd2000000u}, {7, 0xd4000000u},
+ {7, 0xd6000000u}, {7, 0xd8000000u}, {7, 0xda000000u}, {7, 0xdc000000u},
+ {7, 0xde000000u}, {7, 0xe0000000u}, {7, 0xe2000000u}, {7, 0xe4000000u},
+ {8, 0xfc000000u}, {7, 0xe6000000u}, {8, 0xfd000000u}, {13, 0xffd80000u},
+ {19, 0xfffe0000u}, {13, 0xffe00000u}, {14, 0xfff00000u}, {6, 0x88000000u},
+ {15, 0xfffa0000u}, {5, 0x18000000u}, {6, 0x8c000000u}, {5, 0x20000000u},
+ {6, 0x90000000u}, {5, 0x28000000u}, {6, 0x94000000u}, {6, 0x98000000u},
+ {6, 0x9c000000u}, {5, 0x30000000u}, {7, 0xe8000000u}, {7, 0xea000000u},
+ {6, 0xa0000000u}, {6, 0xa4000000u}, {6, 0xa8000000u}, {5, 0x38000000u},
+ {6, 0xac000000u}, {7, 0xec000000u}, {6, 0xb0000000u}, {5, 0x40000000u},
+ {5, 0x48000000u}, {6, 0xb4000000u}, {7, 0xee000000u}, {7, 0xf0000000u},
+ {7, 0xf2000000u}, {7, 0xf4000000u}, {7, 0xf6000000u}, {15, 0xfffc0000u},
+ {11, 0xff800000u}, {14, 0xfff40000u}, {13, 0xffe80000u}, {28, 0xffffffc0u},
+ {20, 0xfffe6000u}, {22, 0xffff4800u}, {20, 0xfffe7000u}, {20, 0xfffe8000u},
+ {22, 0xffff4c00u}, {22, 0xffff5000u}, {22, 0xffff5400u}, {23, 0xffffb200u},
+ {22, 0xffff5800u}, {23, 0xffffb400u}, {23, 0xffffb600u}, {23, 0xffffb800u},
+ {23, 0xffffba00u}, {23, 0xffffbc00u}, {24, 0xffffeb00u}, {23, 0xffffbe00u},
+ {24, 0xffffec00u}, {24, 0xffffed00u}, {22, 0xffff5c00u}, {23, 0xffffc000u},
+ {24, 0xffffee00u}, {23, 0xffffc200u}, {23, 0xffffc400u}, {23, 0xffffc600u},
+ {23, 0xffffc800u}, {21, 0xfffee000u}, {22, 0xffff6000u}, {23, 0xffffca00u},
+ {22, 0xffff6400u}, {23, 0xffffcc00u}, {23, 0xffffce00u}, {24, 0xffffef00u},
+ {22, 0xffff6800u}, {21, 0xfffee800u}, {20, 0xfffe9000u}, {22, 0xffff6c00u},
+ {22, 0xffff7000u}, {23, 0xffffd000u}, {23, 0xffffd200u}, {21, 0xfffef000u},
+ {23, 0xffffd400u}, {22, 0xffff7400u}, {22, 0xffff7800u}, {24, 0xfffff000u},
+ {21, 0xfffef800u}, {22, 0xffff7c00u}, {23, 0xffffd600u}, {23, 0xffffd800u},
+ {21, 0xffff0000u}, {21, 0xffff0800u}, {22, 0xffff8000u}, {21, 0xffff1000u},
+ {23, 0xffffda00u}, {22, 0xffff8400u}, {23, 0xffffdc00u}, {23, 0xffffde00u},
+ {20, 0xfffea000u}, {22, 0xffff8800u}, {22, 0xffff8c00u}, {22, 0xffff9000u},
+ {23, 0xffffe000u}, {22, 0xffff9400u}, {22, 0xffff9800u}, {23, 0xffffe200u},
+ {26, 0xfffff800u}, {26, 0xfffff840u}, {20, 0xfffeb000u}, {19, 0xfffe2000u},
+ {22, 0xffff9c00u}, {23, 0xffffe400u}, {22, 0xffffa000u}, {25, 0xfffff600u},
+ {26, 0xfffff880u}, {26, 0xfffff8c0u}, {26, 0xfffff900u}, {27, 0xfffffbc0u},
+ {27, 0xfffffbe0u}, {26, 0xfffff940u}, {24, 0xfffff100u}, {25, 0xfffff680u},
+ {19, 0xfffe4000u}, {21, 0xffff1800u}, {26, 0xfffff980u}, {27, 0xfffffc00u},
+ {27, 0xfffffc20u}, {26, 0xfffff9c0u}, {27, 0xfffffc40u}, {24, 0xfffff200u},
+ {21, 0xffff2000u}, {21, 0xffff2800u}, {26, 0xfffffa00u}, {26, 0xfffffa40u},
+ {28, 0xffffffd0u}, {27, 0xfffffc60u}, {27, 0xfffffc80u}, {27, 0xfffffca0u},
+ {20, 0xfffec000u}, {24, 0xfffff300u}, {20, 0xfffed000u}, {21, 0xffff3000u},
+ {22, 0xffffa400u}, {21, 0xffff3800u}, {21, 0xffff4000u}, {23, 0xffffe600u},
+ {22, 0xffffa800u}, {22, 0xffffac00u}, {25, 0xfffff700u}, {25, 0xfffff780u},
+ {24, 0xfffff400u}, {24, 0xfffff500u}, {26, 0xfffffa80u}, {23, 0xffffe800u},
+ {26, 0xfffffac0u}, {27, 0xfffffcc0u}, {26, 0xfffffb00u}, {26, 0xfffffb40u},
+ {27, 0xfffffce0u}, {27, 0xfffffd00u}, {27, 0xfffffd20u}, {27, 0xfffffd40u},
+ {27, 0xfffffd60u}, {28, 0xffffffe0u}, {27, 0xfffffd80u}, {27, 0xfffffda0u},
+ {27, 0xfffffdc0u}, {27, 0xfffffde0u}, {27, 0xfffffe00u}, {26, 0xfffffb80u},
+ {30, 0xfffffffcu}};
const nghttp2_huff_decode huff_decode_table[][16] = {
/* 0 */
{
- {4, 0x00, 0},
- {5, 0x00, 0},
- {7, 0x00, 0},
- {8, 0x00, 0},
- {11, 0x00, 0},
- {12, 0x00, 0},
- {16, 0x00, 0},
- {19, 0x00, 0},
- {25, 0x00, 0},
- {28, 0x00, 0},
- {32, 0x00, 0},
- {35, 0x00, 0},
- {42, 0x00, 0},
- {49, 0x00, 0},
- {57, 0x00, 0},
- {64, 0x01, 0},
+ {0x04, 0},
+ {0x05, 0},
+ {0x07, 0},
+ {0x08, 0},
+ {0x0b, 0},
+ {0x0c, 0},
+ {0x10, 0},
+ {0x13, 0},
+ {0x19, 0},
+ {0x1c, 0},
+ {0x20, 0},
+ {0x23, 0},
+ {0x2a, 0},
+ {0x31, 0},
+ {0x39, 0},
+ {0x4040, 0},
},
/* 1 */
{
- {0, 0x03, 48},
- {0, 0x03, 49},
- {0, 0x03, 50},
- {0, 0x03, 97},
- {0, 0x03, 99},
- {0, 0x03, 101},
- {0, 0x03, 105},
- {0, 0x03, 111},
- {0, 0x03, 115},
- {0, 0x03, 116},
- {13, 0x00, 0},
- {14, 0x00, 0},
- {17, 0x00, 0},
- {18, 0x00, 0},
- {20, 0x00, 0},
- {21, 0x00, 0},
+ {0xc000, 48},
+ {0xc000, 49},
+ {0xc000, 50},
+ {0xc000, 97},
+ {0xc000, 99},
+ {0xc000, 101},
+ {0xc000, 105},
+ {0xc000, 111},
+ {0xc000, 115},
+ {0xc000, 116},
+ {0x0d, 0},
+ {0x0e, 0},
+ {0x11, 0},
+ {0x12, 0},
+ {0x14, 0},
+ {0x15, 0},
},
/* 2 */
{
- {1, 0x02, 48},
- {22, 0x03, 48},
- {1, 0x02, 49},
- {22, 0x03, 49},
- {1, 0x02, 50},
- {22, 0x03, 50},
- {1, 0x02, 97},
- {22, 0x03, 97},
- {1, 0x02, 99},
- {22, 0x03, 99},
- {1, 0x02, 101},
- {22, 0x03, 101},
- {1, 0x02, 105},
- {22, 0x03, 105},
- {1, 0x02, 111},
- {22, 0x03, 111},
+ {0x8001, 48},
+ {0xc016, 48},
+ {0x8001, 49},
+ {0xc016, 49},
+ {0x8001, 50},
+ {0xc016, 50},
+ {0x8001, 97},
+ {0xc016, 97},
+ {0x8001, 99},
+ {0xc016, 99},
+ {0x8001, 101},
+ {0xc016, 101},
+ {0x8001, 105},
+ {0xc016, 105},
+ {0x8001, 111},
+ {0xc016, 111},
},
/* 3 */
{
- {2, 0x02, 48},
- {9, 0x02, 48},
- {23, 0x02, 48},
- {40, 0x03, 48},
- {2, 0x02, 49},
- {9, 0x02, 49},
- {23, 0x02, 49},
- {40, 0x03, 49},
- {2, 0x02, 50},
- {9, 0x02, 50},
- {23, 0x02, 50},
- {40, 0x03, 50},
- {2, 0x02, 97},
- {9, 0x02, 97},
- {23, 0x02, 97},
- {40, 0x03, 97},
+ {0x8002, 48},
+ {0x8009, 48},
+ {0x8017, 48},
+ {0xc028, 48},
+ {0x8002, 49},
+ {0x8009, 49},
+ {0x8017, 49},
+ {0xc028, 49},
+ {0x8002, 50},
+ {0x8009, 50},
+ {0x8017, 50},
+ {0xc028, 50},
+ {0x8002, 97},
+ {0x8009, 97},
+ {0x8017, 97},
+ {0xc028, 97},
},
/* 4 */
{
- {3, 0x02, 48},
- {6, 0x02, 48},
- {10, 0x02, 48},
- {15, 0x02, 48},
- {24, 0x02, 48},
- {31, 0x02, 48},
- {41, 0x02, 48},
- {56, 0x03, 48},
- {3, 0x02, 49},
- {6, 0x02, 49},
- {10, 0x02, 49},
- {15, 0x02, 49},
- {24, 0x02, 49},
- {31, 0x02, 49},
- {41, 0x02, 49},
- {56, 0x03, 49},
+ {0x8003, 48},
+ {0x8006, 48},
+ {0x800a, 48},
+ {0x800f, 48},
+ {0x8018, 48},
+ {0x801f, 48},
+ {0x8029, 48},
+ {0xc038, 48},
+ {0x8003, 49},
+ {0x8006, 49},
+ {0x800a, 49},
+ {0x800f, 49},
+ {0x8018, 49},
+ {0x801f, 49},
+ {0x8029, 49},
+ {0xc038, 49},
},
/* 5 */
{
- {3, 0x02, 50},
- {6, 0x02, 50},
- {10, 0x02, 50},
- {15, 0x02, 50},
- {24, 0x02, 50},
- {31, 0x02, 50},
- {41, 0x02, 50},
- {56, 0x03, 50},
- {3, 0x02, 97},
- {6, 0x02, 97},
- {10, 0x02, 97},
- {15, 0x02, 97},
- {24, 0x02, 97},
- {31, 0x02, 97},
- {41, 0x02, 97},
- {56, 0x03, 97},
+ {0x8003, 50},
+ {0x8006, 50},
+ {0x800a, 50},
+ {0x800f, 50},
+ {0x8018, 50},
+ {0x801f, 50},
+ {0x8029, 50},
+ {0xc038, 50},
+ {0x8003, 97},
+ {0x8006, 97},
+ {0x800a, 97},
+ {0x800f, 97},
+ {0x8018, 97},
+ {0x801f, 97},
+ {0x8029, 97},
+ {0xc038, 97},
},
/* 6 */
{
- {2, 0x02, 99},
- {9, 0x02, 99},
- {23, 0x02, 99},
- {40, 0x03, 99},
- {2, 0x02, 101},
- {9, 0x02, 101},
- {23, 0x02, 101},
- {40, 0x03, 101},
- {2, 0x02, 105},
- {9, 0x02, 105},
- {23, 0x02, 105},
- {40, 0x03, 105},
- {2, 0x02, 111},
- {9, 0x02, 111},
- {23, 0x02, 111},
- {40, 0x03, 111},
+ {0x8002, 99},
+ {0x8009, 99},
+ {0x8017, 99},
+ {0xc028, 99},
+ {0x8002, 101},
+ {0x8009, 101},
+ {0x8017, 101},
+ {0xc028, 101},
+ {0x8002, 105},
+ {0x8009, 105},
+ {0x8017, 105},
+ {0xc028, 105},
+ {0x8002, 111},
+ {0x8009, 111},
+ {0x8017, 111},
+ {0xc028, 111},
},
/* 7 */
{
- {3, 0x02, 99},
- {6, 0x02, 99},
- {10, 0x02, 99},
- {15, 0x02, 99},
- {24, 0x02, 99},
- {31, 0x02, 99},
- {41, 0x02, 99},
- {56, 0x03, 99},
- {3, 0x02, 101},
- {6, 0x02, 101},
- {10, 0x02, 101},
- {15, 0x02, 101},
- {24, 0x02, 101},
- {31, 0x02, 101},
- {41, 0x02, 101},
- {56, 0x03, 101},
+ {0x8003, 99},
+ {0x8006, 99},
+ {0x800a, 99},
+ {0x800f, 99},
+ {0x8018, 99},
+ {0x801f, 99},
+ {0x8029, 99},
+ {0xc038, 99},
+ {0x8003, 101},
+ {0x8006, 101},
+ {0x800a, 101},
+ {0x800f, 101},
+ {0x8018, 101},
+ {0x801f, 101},
+ {0x8029, 101},
+ {0xc038, 101},
},
/* 8 */
{
- {3, 0x02, 105},
- {6, 0x02, 105},
- {10, 0x02, 105},
- {15, 0x02, 105},
- {24, 0x02, 105},
- {31, 0x02, 105},
- {41, 0x02, 105},
- {56, 0x03, 105},
- {3, 0x02, 111},
- {6, 0x02, 111},
- {10, 0x02, 111},
- {15, 0x02, 111},
- {24, 0x02, 111},
- {31, 0x02, 111},
- {41, 0x02, 111},
- {56, 0x03, 111},
+ {0x8003, 105},
+ {0x8006, 105},
+ {0x800a, 105},
+ {0x800f, 105},
+ {0x8018, 105},
+ {0x801f, 105},
+ {0x8029, 105},
+ {0xc038, 105},
+ {0x8003, 111},
+ {0x8006, 111},
+ {0x800a, 111},
+ {0x800f, 111},
+ {0x8018, 111},
+ {0x801f, 111},
+ {0x8029, 111},
+ {0xc038, 111},
},
/* 9 */
{
- {1, 0x02, 115},
- {22, 0x03, 115},
- {1, 0x02, 116},
- {22, 0x03, 116},
- {0, 0x03, 32},
- {0, 0x03, 37},
- {0, 0x03, 45},
- {0, 0x03, 46},
- {0, 0x03, 47},
- {0, 0x03, 51},
- {0, 0x03, 52},
- {0, 0x03, 53},
- {0, 0x03, 54},
- {0, 0x03, 55},
- {0, 0x03, 56},
- {0, 0x03, 57},
+ {0x8001, 115},
+ {0xc016, 115},
+ {0x8001, 116},
+ {0xc016, 116},
+ {0xc000, 32},
+ {0xc000, 37},
+ {0xc000, 45},
+ {0xc000, 46},
+ {0xc000, 47},
+ {0xc000, 51},
+ {0xc000, 52},
+ {0xc000, 53},
+ {0xc000, 54},
+ {0xc000, 55},
+ {0xc000, 56},
+ {0xc000, 57},
},
/* 10 */
{
- {2, 0x02, 115},
- {9, 0x02, 115},
- {23, 0x02, 115},
- {40, 0x03, 115},
- {2, 0x02, 116},
- {9, 0x02, 116},
- {23, 0x02, 116},
- {40, 0x03, 116},
- {1, 0x02, 32},
- {22, 0x03, 32},
- {1, 0x02, 37},
- {22, 0x03, 37},
- {1, 0x02, 45},
- {22, 0x03, 45},
- {1, 0x02, 46},
- {22, 0x03, 46},
+ {0x8002, 115},
+ {0x8009, 115},
+ {0x8017, 115},
+ {0xc028, 115},
+ {0x8002, 116},
+ {0x8009, 116},
+ {0x8017, 116},
+ {0xc028, 116},
+ {0x8001, 32},
+ {0xc016, 32},
+ {0x8001, 37},
+ {0xc016, 37},
+ {0x8001, 45},
+ {0xc016, 45},
+ {0x8001, 46},
+ {0xc016, 46},
},
/* 11 */
{
- {3, 0x02, 115},
- {6, 0x02, 115},
- {10, 0x02, 115},
- {15, 0x02, 115},
- {24, 0x02, 115},
- {31, 0x02, 115},
- {41, 0x02, 115},
- {56, 0x03, 115},
- {3, 0x02, 116},
- {6, 0x02, 116},
- {10, 0x02, 116},
- {15, 0x02, 116},
- {24, 0x02, 116},
- {31, 0x02, 116},
- {41, 0x02, 116},
- {56, 0x03, 116},
+ {0x8003, 115},
+ {0x8006, 115},
+ {0x800a, 115},
+ {0x800f, 115},
+ {0x8018, 115},
+ {0x801f, 115},
+ {0x8029, 115},
+ {0xc038, 115},
+ {0x8003, 116},
+ {0x8006, 116},
+ {0x800a, 116},
+ {0x800f, 116},
+ {0x8018, 116},
+ {0x801f, 116},
+ {0x8029, 116},
+ {0xc038, 116},
},
/* 12 */
{
- {2, 0x02, 32},
- {9, 0x02, 32},
- {23, 0x02, 32},
- {40, 0x03, 32},
- {2, 0x02, 37},
- {9, 0x02, 37},
- {23, 0x02, 37},
- {40, 0x03, 37},
- {2, 0x02, 45},
- {9, 0x02, 45},
- {23, 0x02, 45},
- {40, 0x03, 45},
- {2, 0x02, 46},
- {9, 0x02, 46},
- {23, 0x02, 46},
- {40, 0x03, 46},
+ {0x8002, 32},
+ {0x8009, 32},
+ {0x8017, 32},
+ {0xc028, 32},
+ {0x8002, 37},
+ {0x8009, 37},
+ {0x8017, 37},
+ {0xc028, 37},
+ {0x8002, 45},
+ {0x8009, 45},
+ {0x8017, 45},
+ {0xc028, 45},
+ {0x8002, 46},
+ {0x8009, 46},
+ {0x8017, 46},
+ {0xc028, 46},
},
/* 13 */
{
- {3, 0x02, 32},
- {6, 0x02, 32},
- {10, 0x02, 32},
- {15, 0x02, 32},
- {24, 0x02, 32},
- {31, 0x02, 32},
- {41, 0x02, 32},
- {56, 0x03, 32},
- {3, 0x02, 37},
- {6, 0x02, 37},
- {10, 0x02, 37},
- {15, 0x02, 37},
- {24, 0x02, 37},
- {31, 0x02, 37},
- {41, 0x02, 37},
- {56, 0x03, 37},
+ {0x8003, 32},
+ {0x8006, 32},
+ {0x800a, 32},
+ {0x800f, 32},
+ {0x8018, 32},
+ {0x801f, 32},
+ {0x8029, 32},
+ {0xc038, 32},
+ {0x8003, 37},
+ {0x8006, 37},
+ {0x800a, 37},
+ {0x800f, 37},
+ {0x8018, 37},
+ {0x801f, 37},
+ {0x8029, 37},
+ {0xc038, 37},
},
/* 14 */
{
- {3, 0x02, 45},
- {6, 0x02, 45},
- {10, 0x02, 45},
- {15, 0x02, 45},
- {24, 0x02, 45},
- {31, 0x02, 45},
- {41, 0x02, 45},
- {56, 0x03, 45},
- {3, 0x02, 46},
- {6, 0x02, 46},
- {10, 0x02, 46},
- {15, 0x02, 46},
- {24, 0x02, 46},
- {31, 0x02, 46},
- {41, 0x02, 46},
- {56, 0x03, 46},
+ {0x8003, 45},
+ {0x8006, 45},
+ {0x800a, 45},
+ {0x800f, 45},
+ {0x8018, 45},
+ {0x801f, 45},
+ {0x8029, 45},
+ {0xc038, 45},
+ {0x8003, 46},
+ {0x8006, 46},
+ {0x800a, 46},
+ {0x800f, 46},
+ {0x8018, 46},
+ {0x801f, 46},
+ {0x8029, 46},
+ {0xc038, 46},
},
/* 15 */
{
- {1, 0x02, 47},
- {22, 0x03, 47},
- {1, 0x02, 51},
- {22, 0x03, 51},
- {1, 0x02, 52},
- {22, 0x03, 52},
- {1, 0x02, 53},
- {22, 0x03, 53},
- {1, 0x02, 54},
- {22, 0x03, 54},
- {1, 0x02, 55},
- {22, 0x03, 55},
- {1, 0x02, 56},
- {22, 0x03, 56},
- {1, 0x02, 57},
- {22, 0x03, 57},
+ {0x8001, 47},
+ {0xc016, 47},
+ {0x8001, 51},
+ {0xc016, 51},
+ {0x8001, 52},
+ {0xc016, 52},
+ {0x8001, 53},
+ {0xc016, 53},
+ {0x8001, 54},
+ {0xc016, 54},
+ {0x8001, 55},
+ {0xc016, 55},
+ {0x8001, 56},
+ {0xc016, 56},
+ {0x8001, 57},
+ {0xc016, 57},
},
/* 16 */
{
- {2, 0x02, 47},
- {9, 0x02, 47},
- {23, 0x02, 47},
- {40, 0x03, 47},
- {2, 0x02, 51},
- {9, 0x02, 51},
- {23, 0x02, 51},
- {40, 0x03, 51},
- {2, 0x02, 52},
- {9, 0x02, 52},
- {23, 0x02, 52},
- {40, 0x03, 52},
- {2, 0x02, 53},
- {9, 0x02, 53},
- {23, 0x02, 53},
- {40, 0x03, 53},
+ {0x8002, 47},
+ {0x8009, 47},
+ {0x8017, 47},
+ {0xc028, 47},
+ {0x8002, 51},
+ {0x8009, 51},
+ {0x8017, 51},
+ {0xc028, 51},
+ {0x8002, 52},
+ {0x8009, 52},
+ {0x8017, 52},
+ {0xc028, 52},
+ {0x8002, 53},
+ {0x8009, 53},
+ {0x8017, 53},
+ {0xc028, 53},
},
/* 17 */
{
- {3, 0x02, 47},
- {6, 0x02, 47},
- {10, 0x02, 47},
- {15, 0x02, 47},
- {24, 0x02, 47},
- {31, 0x02, 47},
- {41, 0x02, 47},
- {56, 0x03, 47},
- {3, 0x02, 51},
- {6, 0x02, 51},
- {10, 0x02, 51},
- {15, 0x02, 51},
- {24, 0x02, 51},
- {31, 0x02, 51},
- {41, 0x02, 51},
- {56, 0x03, 51},
+ {0x8003, 47},
+ {0x8006, 47},
+ {0x800a, 47},
+ {0x800f, 47},
+ {0x8018, 47},
+ {0x801f, 47},
+ {0x8029, 47},
+ {0xc038, 47},
+ {0x8003, 51},
+ {0x8006, 51},
+ {0x800a, 51},
+ {0x800f, 51},
+ {0x8018, 51},
+ {0x801f, 51},
+ {0x8029, 51},
+ {0xc038, 51},
},
/* 18 */
{
- {3, 0x02, 52},
- {6, 0x02, 52},
- {10, 0x02, 52},
- {15, 0x02, 52},
- {24, 0x02, 52},
- {31, 0x02, 52},
- {41, 0x02, 52},
- {56, 0x03, 52},
- {3, 0x02, 53},
- {6, 0x02, 53},
- {10, 0x02, 53},
- {15, 0x02, 53},
- {24, 0x02, 53},
- {31, 0x02, 53},
- {41, 0x02, 53},
- {56, 0x03, 53},
+ {0x8003, 52},
+ {0x8006, 52},
+ {0x800a, 52},
+ {0x800f, 52},
+ {0x8018, 52},
+ {0x801f, 52},
+ {0x8029, 52},
+ {0xc038, 52},
+ {0x8003, 53},
+ {0x8006, 53},
+ {0x800a, 53},
+ {0x800f, 53},
+ {0x8018, 53},
+ {0x801f, 53},
+ {0x8029, 53},
+ {0xc038, 53},
},
/* 19 */
{
- {2, 0x02, 54},
- {9, 0x02, 54},
- {23, 0x02, 54},
- {40, 0x03, 54},
- {2, 0x02, 55},
- {9, 0x02, 55},
- {23, 0x02, 55},
- {40, 0x03, 55},
- {2, 0x02, 56},
- {9, 0x02, 56},
- {23, 0x02, 56},
- {40, 0x03, 56},
- {2, 0x02, 57},
- {9, 0x02, 57},
- {23, 0x02, 57},
- {40, 0x03, 57},
+ {0x8002, 54},
+ {0x8009, 54},
+ {0x8017, 54},
+ {0xc028, 54},
+ {0x8002, 55},
+ {0x8009, 55},
+ {0x8017, 55},
+ {0xc028, 55},
+ {0x8002, 56},
+ {0x8009, 56},
+ {0x8017, 56},
+ {0xc028, 56},
+ {0x8002, 57},
+ {0x8009, 57},
+ {0x8017, 57},
+ {0xc028, 57},
},
/* 20 */
{
- {3, 0x02, 54},
- {6, 0x02, 54},
- {10, 0x02, 54},
- {15, 0x02, 54},
- {24, 0x02, 54},
- {31, 0x02, 54},
- {41, 0x02, 54},
- {56, 0x03, 54},
- {3, 0x02, 55},
- {6, 0x02, 55},
- {10, 0x02, 55},
- {15, 0x02, 55},
- {24, 0x02, 55},
- {31, 0x02, 55},
- {41, 0x02, 55},
- {56, 0x03, 55},
+ {0x8003, 54},
+ {0x8006, 54},
+ {0x800a, 54},
+ {0x800f, 54},
+ {0x8018, 54},
+ {0x801f, 54},
+ {0x8029, 54},
+ {0xc038, 54},
+ {0x8003, 55},
+ {0x8006, 55},
+ {0x800a, 55},
+ {0x800f, 55},
+ {0x8018, 55},
+ {0x801f, 55},
+ {0x8029, 55},
+ {0xc038, 55},
},
/* 21 */
{
- {3, 0x02, 56},
- {6, 0x02, 56},
- {10, 0x02, 56},
- {15, 0x02, 56},
- {24, 0x02, 56},
- {31, 0x02, 56},
- {41, 0x02, 56},
- {56, 0x03, 56},
- {3, 0x02, 57},
- {6, 0x02, 57},
- {10, 0x02, 57},
- {15, 0x02, 57},
- {24, 0x02, 57},
- {31, 0x02, 57},
- {41, 0x02, 57},
- {56, 0x03, 57},
+ {0x8003, 56},
+ {0x8006, 56},
+ {0x800a, 56},
+ {0x800f, 56},
+ {0x8018, 56},
+ {0x801f, 56},
+ {0x8029, 56},
+ {0xc038, 56},
+ {0x8003, 57},
+ {0x8006, 57},
+ {0x800a, 57},
+ {0x800f, 57},
+ {0x8018, 57},
+ {0x801f, 57},
+ {0x8029, 57},
+ {0xc038, 57},
},
/* 22 */
{
- {26, 0x00, 0},
- {27, 0x00, 0},
- {29, 0x00, 0},
- {30, 0x00, 0},
- {33, 0x00, 0},
- {34, 0x00, 0},
- {36, 0x00, 0},
- {37, 0x00, 0},
- {43, 0x00, 0},
- {46, 0x00, 0},
- {50, 0x00, 0},
- {53, 0x00, 0},
- {58, 0x00, 0},
- {61, 0x00, 0},
- {65, 0x00, 0},
- {68, 0x01, 0},
+ {0x1a, 0},
+ {0x1b, 0},
+ {0x1d, 0},
+ {0x1e, 0},
+ {0x21, 0},
+ {0x22, 0},
+ {0x24, 0},
+ {0x25, 0},
+ {0x2b, 0},
+ {0x2e, 0},
+ {0x32, 0},
+ {0x35, 0},
+ {0x3a, 0},
+ {0x3d, 0},
+ {0x41, 0},
+ {0x4044, 0},
},
/* 23 */
{
- {0, 0x03, 61},
- {0, 0x03, 65},
- {0, 0x03, 95},
- {0, 0x03, 98},
- {0, 0x03, 100},
- {0, 0x03, 102},
- {0, 0x03, 103},
- {0, 0x03, 104},
- {0, 0x03, 108},
- {0, 0x03, 109},
- {0, 0x03, 110},
- {0, 0x03, 112},
- {0, 0x03, 114},
- {0, 0x03, 117},
- {38, 0x00, 0},
- {39, 0x00, 0},
+ {0xc000, 61},
+ {0xc000, 65},
+ {0xc000, 95},
+ {0xc000, 98},
+ {0xc000, 100},
+ {0xc000, 102},
+ {0xc000, 103},
+ {0xc000, 104},
+ {0xc000, 108},
+ {0xc000, 109},
+ {0xc000, 110},
+ {0xc000, 112},
+ {0xc000, 114},
+ {0xc000, 117},
+ {0x26, 0},
+ {0x27, 0},
},
/* 24 */
{
- {1, 0x02, 61},
- {22, 0x03, 61},
- {1, 0x02, 65},
- {22, 0x03, 65},
- {1, 0x02, 95},
- {22, 0x03, 95},
- {1, 0x02, 98},
- {22, 0x03, 98},
- {1, 0x02, 100},
- {22, 0x03, 100},
- {1, 0x02, 102},
- {22, 0x03, 102},
- {1, 0x02, 103},
- {22, 0x03, 103},
- {1, 0x02, 104},
- {22, 0x03, 104},
+ {0x8001, 61},
+ {0xc016, 61},
+ {0x8001, 65},
+ {0xc016, 65},
+ {0x8001, 95},
+ {0xc016, 95},
+ {0x8001, 98},
+ {0xc016, 98},
+ {0x8001, 100},
+ {0xc016, 100},
+ {0x8001, 102},
+ {0xc016, 102},
+ {0x8001, 103},
+ {0xc016, 103},
+ {0x8001, 104},
+ {0xc016, 104},
},
/* 25 */
{
- {2, 0x02, 61},
- {9, 0x02, 61},
- {23, 0x02, 61},
- {40, 0x03, 61},
- {2, 0x02, 65},
- {9, 0x02, 65},
- {23, 0x02, 65},
- {40, 0x03, 65},
- {2, 0x02, 95},
- {9, 0x02, 95},
- {23, 0x02, 95},
- {40, 0x03, 95},
- {2, 0x02, 98},
- {9, 0x02, 98},
- {23, 0x02, 98},
- {40, 0x03, 98},
+ {0x8002, 61},
+ {0x8009, 61},
+ {0x8017, 61},
+ {0xc028, 61},
+ {0x8002, 65},
+ {0x8009, 65},
+ {0x8017, 65},
+ {0xc028, 65},
+ {0x8002, 95},
+ {0x8009, 95},
+ {0x8017, 95},
+ {0xc028, 95},
+ {0x8002, 98},
+ {0x8009, 98},
+ {0x8017, 98},
+ {0xc028, 98},
},
/* 26 */
{
- {3, 0x02, 61},
- {6, 0x02, 61},
- {10, 0x02, 61},
- {15, 0x02, 61},
- {24, 0x02, 61},
- {31, 0x02, 61},
- {41, 0x02, 61},
- {56, 0x03, 61},
- {3, 0x02, 65},
- {6, 0x02, 65},
- {10, 0x02, 65},
- {15, 0x02, 65},
- {24, 0x02, 65},
- {31, 0x02, 65},
- {41, 0x02, 65},
- {56, 0x03, 65},
+ {0x8003, 61},
+ {0x8006, 61},
+ {0x800a, 61},
+ {0x800f, 61},
+ {0x8018, 61},
+ {0x801f, 61},
+ {0x8029, 61},
+ {0xc038, 61},
+ {0x8003, 65},
+ {0x8006, 65},
+ {0x800a, 65},
+ {0x800f, 65},
+ {0x8018, 65},
+ {0x801f, 65},
+ {0x8029, 65},
+ {0xc038, 65},
},
/* 27 */
{
- {3, 0x02, 95},
- {6, 0x02, 95},
- {10, 0x02, 95},
- {15, 0x02, 95},
- {24, 0x02, 95},
- {31, 0x02, 95},
- {41, 0x02, 95},
- {56, 0x03, 95},
- {3, 0x02, 98},
- {6, 0x02, 98},
- {10, 0x02, 98},
- {15, 0x02, 98},
- {24, 0x02, 98},
- {31, 0x02, 98},
- {41, 0x02, 98},
- {56, 0x03, 98},
+ {0x8003, 95},
+ {0x8006, 95},
+ {0x800a, 95},
+ {0x800f, 95},
+ {0x8018, 95},
+ {0x801f, 95},
+ {0x8029, 95},
+ {0xc038, 95},
+ {0x8003, 98},
+ {0x8006, 98},
+ {0x800a, 98},
+ {0x800f, 98},
+ {0x8018, 98},
+ {0x801f, 98},
+ {0x8029, 98},
+ {0xc038, 98},
},
/* 28 */
{
- {2, 0x02, 100},
- {9, 0x02, 100},
- {23, 0x02, 100},
- {40, 0x03, 100},
- {2, 0x02, 102},
- {9, 0x02, 102},
- {23, 0x02, 102},
- {40, 0x03, 102},
- {2, 0x02, 103},
- {9, 0x02, 103},
- {23, 0x02, 103},
- {40, 0x03, 103},
- {2, 0x02, 104},
- {9, 0x02, 104},
- {23, 0x02, 104},
- {40, 0x03, 104},
+ {0x8002, 100},
+ {0x8009, 100},
+ {0x8017, 100},
+ {0xc028, 100},
+ {0x8002, 102},
+ {0x8009, 102},
+ {0x8017, 102},
+ {0xc028, 102},
+ {0x8002, 103},
+ {0x8009, 103},
+ {0x8017, 103},
+ {0xc028, 103},
+ {0x8002, 104},
+ {0x8009, 104},
+ {0x8017, 104},
+ {0xc028, 104},
},
/* 29 */
{
- {3, 0x02, 100},
- {6, 0x02, 100},
- {10, 0x02, 100},
- {15, 0x02, 100},
- {24, 0x02, 100},
- {31, 0x02, 100},
- {41, 0x02, 100},
- {56, 0x03, 100},
- {3, 0x02, 102},
- {6, 0x02, 102},
- {10, 0x02, 102},
- {15, 0x02, 102},
- {24, 0x02, 102},
- {31, 0x02, 102},
- {41, 0x02, 102},
- {56, 0x03, 102},
+ {0x8003, 100},
+ {0x8006, 100},
+ {0x800a, 100},
+ {0x800f, 100},
+ {0x8018, 100},
+ {0x801f, 100},
+ {0x8029, 100},
+ {0xc038, 100},
+ {0x8003, 102},
+ {0x8006, 102},
+ {0x800a, 102},
+ {0x800f, 102},
+ {0x8018, 102},
+ {0x801f, 102},
+ {0x8029, 102},
+ {0xc038, 102},
},
/* 30 */
{
- {3, 0x02, 103},
- {6, 0x02, 103},
- {10, 0x02, 103},
- {15, 0x02, 103},
- {24, 0x02, 103},
- {31, 0x02, 103},
- {41, 0x02, 103},
- {56, 0x03, 103},
- {3, 0x02, 104},
- {6, 0x02, 104},
- {10, 0x02, 104},
- {15, 0x02, 104},
- {24, 0x02, 104},
- {31, 0x02, 104},
- {41, 0x02, 104},
- {56, 0x03, 104},
+ {0x8003, 103},
+ {0x8006, 103},
+ {0x800a, 103},
+ {0x800f, 103},
+ {0x8018, 103},
+ {0x801f, 103},
+ {0x8029, 103},
+ {0xc038, 103},
+ {0x8003, 104},
+ {0x8006, 104},
+ {0x800a, 104},
+ {0x800f, 104},
+ {0x8018, 104},
+ {0x801f, 104},
+ {0x8029, 104},
+ {0xc038, 104},
},
/* 31 */
{
- {1, 0x02, 108},
- {22, 0x03, 108},
- {1, 0x02, 109},
- {22, 0x03, 109},
- {1, 0x02, 110},
- {22, 0x03, 110},
- {1, 0x02, 112},
- {22, 0x03, 112},
- {1, 0x02, 114},
- {22, 0x03, 114},
- {1, 0x02, 117},
- {22, 0x03, 117},
- {0, 0x03, 58},
- {0, 0x03, 66},
- {0, 0x03, 67},
- {0, 0x03, 68},
+ {0x8001, 108},
+ {0xc016, 108},
+ {0x8001, 109},
+ {0xc016, 109},
+ {0x8001, 110},
+ {0xc016, 110},
+ {0x8001, 112},
+ {0xc016, 112},
+ {0x8001, 114},
+ {0xc016, 114},
+ {0x8001, 117},
+ {0xc016, 117},
+ {0xc000, 58},
+ {0xc000, 66},
+ {0xc000, 67},
+ {0xc000, 68},
},
/* 32 */
{
- {2, 0x02, 108},
- {9, 0x02, 108},
- {23, 0x02, 108},
- {40, 0x03, 108},
- {2, 0x02, 109},
- {9, 0x02, 109},
- {23, 0x02, 109},
- {40, 0x03, 109},
- {2, 0x02, 110},
- {9, 0x02, 110},
- {23, 0x02, 110},
- {40, 0x03, 110},
- {2, 0x02, 112},
- {9, 0x02, 112},
- {23, 0x02, 112},
- {40, 0x03, 112},
+ {0x8002, 108},
+ {0x8009, 108},
+ {0x8017, 108},
+ {0xc028, 108},
+ {0x8002, 109},
+ {0x8009, 109},
+ {0x8017, 109},
+ {0xc028, 109},
+ {0x8002, 110},
+ {0x8009, 110},
+ {0x8017, 110},
+ {0xc028, 110},
+ {0x8002, 112},
+ {0x8009, 112},
+ {0x8017, 112},
+ {0xc028, 112},
},
/* 33 */
{
- {3, 0x02, 108},
- {6, 0x02, 108},
- {10, 0x02, 108},
- {15, 0x02, 108},
- {24, 0x02, 108},
- {31, 0x02, 108},
- {41, 0x02, 108},
- {56, 0x03, 108},
- {3, 0x02, 109},
- {6, 0x02, 109},
- {10, 0x02, 109},
- {15, 0x02, 109},
- {24, 0x02, 109},
- {31, 0x02, 109},
- {41, 0x02, 109},
- {56, 0x03, 109},
+ {0x8003, 108},
+ {0x8006, 108},
+ {0x800a, 108},
+ {0x800f, 108},
+ {0x8018, 108},
+ {0x801f, 108},
+ {0x8029, 108},
+ {0xc038, 108},
+ {0x8003, 109},
+ {0x8006, 109},
+ {0x800a, 109},
+ {0x800f, 109},
+ {0x8018, 109},
+ {0x801f, 109},
+ {0x8029, 109},
+ {0xc038, 109},
},
/* 34 */
{
- {3, 0x02, 110},
- {6, 0x02, 110},
- {10, 0x02, 110},
- {15, 0x02, 110},
- {24, 0x02, 110},
- {31, 0x02, 110},
- {41, 0x02, 110},
- {56, 0x03, 110},
- {3, 0x02, 112},
- {6, 0x02, 112},
- {10, 0x02, 112},
- {15, 0x02, 112},
- {24, 0x02, 112},
- {31, 0x02, 112},
- {41, 0x02, 112},
- {56, 0x03, 112},
+ {0x8003, 110},
+ {0x8006, 110},
+ {0x800a, 110},
+ {0x800f, 110},
+ {0x8018, 110},
+ {0x801f, 110},
+ {0x8029, 110},
+ {0xc038, 110},
+ {0x8003, 112},
+ {0x8006, 112},
+ {0x800a, 112},
+ {0x800f, 112},
+ {0x8018, 112},
+ {0x801f, 112},
+ {0x8029, 112},
+ {0xc038, 112},
},
/* 35 */
{
- {2, 0x02, 114},
- {9, 0x02, 114},
- {23, 0x02, 114},
- {40, 0x03, 114},
- {2, 0x02, 117},
- {9, 0x02, 117},
- {23, 0x02, 117},
- {40, 0x03, 117},
- {1, 0x02, 58},
- {22, 0x03, 58},
- {1, 0x02, 66},
- {22, 0x03, 66},
- {1, 0x02, 67},
- {22, 0x03, 67},
- {1, 0x02, 68},
- {22, 0x03, 68},
+ {0x8002, 114},
+ {0x8009, 114},
+ {0x8017, 114},
+ {0xc028, 114},
+ {0x8002, 117},
+ {0x8009, 117},
+ {0x8017, 117},
+ {0xc028, 117},
+ {0x8001, 58},
+ {0xc016, 58},
+ {0x8001, 66},
+ {0xc016, 66},
+ {0x8001, 67},
+ {0xc016, 67},
+ {0x8001, 68},
+ {0xc016, 68},
},
/* 36 */
{
- {3, 0x02, 114},
- {6, 0x02, 114},
- {10, 0x02, 114},
- {15, 0x02, 114},
- {24, 0x02, 114},
- {31, 0x02, 114},
- {41, 0x02, 114},
- {56, 0x03, 114},
- {3, 0x02, 117},
- {6, 0x02, 117},
- {10, 0x02, 117},
- {15, 0x02, 117},
- {24, 0x02, 117},
- {31, 0x02, 117},
- {41, 0x02, 117},
- {56, 0x03, 117},
+ {0x8003, 114},
+ {0x8006, 114},
+ {0x800a, 114},
+ {0x800f, 114},
+ {0x8018, 114},
+ {0x801f, 114},
+ {0x8029, 114},
+ {0xc038, 114},
+ {0x8003, 117},
+ {0x8006, 117},
+ {0x800a, 117},
+ {0x800f, 117},
+ {0x8018, 117},
+ {0x801f, 117},
+ {0x8029, 117},
+ {0xc038, 117},
},
/* 37 */
{
- {2, 0x02, 58},
- {9, 0x02, 58},
- {23, 0x02, 58},
- {40, 0x03, 58},
- {2, 0x02, 66},
- {9, 0x02, 66},
- {23, 0x02, 66},
- {40, 0x03, 66},
- {2, 0x02, 67},
- {9, 0x02, 67},
- {23, 0x02, 67},
- {40, 0x03, 67},
- {2, 0x02, 68},
- {9, 0x02, 68},
- {23, 0x02, 68},
- {40, 0x03, 68},
+ {0x8002, 58},
+ {0x8009, 58},
+ {0x8017, 58},
+ {0xc028, 58},
+ {0x8002, 66},
+ {0x8009, 66},
+ {0x8017, 66},
+ {0xc028, 66},
+ {0x8002, 67},
+ {0x8009, 67},
+ {0x8017, 67},
+ {0xc028, 67},
+ {0x8002, 68},
+ {0x8009, 68},
+ {0x8017, 68},
+ {0xc028, 68},
},
/* 38 */
{
- {3, 0x02, 58},
- {6, 0x02, 58},
- {10, 0x02, 58},
- {15, 0x02, 58},
- {24, 0x02, 58},
- {31, 0x02, 58},
- {41, 0x02, 58},
- {56, 0x03, 58},
- {3, 0x02, 66},
- {6, 0x02, 66},
- {10, 0x02, 66},
- {15, 0x02, 66},
- {24, 0x02, 66},
- {31, 0x02, 66},
- {41, 0x02, 66},
- {56, 0x03, 66},
+ {0x8003, 58},
+ {0x8006, 58},
+ {0x800a, 58},
+ {0x800f, 58},
+ {0x8018, 58},
+ {0x801f, 58},
+ {0x8029, 58},
+ {0xc038, 58},
+ {0x8003, 66},
+ {0x8006, 66},
+ {0x800a, 66},
+ {0x800f, 66},
+ {0x8018, 66},
+ {0x801f, 66},
+ {0x8029, 66},
+ {0xc038, 66},
},
/* 39 */
{
- {3, 0x02, 67},
- {6, 0x02, 67},
- {10, 0x02, 67},
- {15, 0x02, 67},
- {24, 0x02, 67},
- {31, 0x02, 67},
- {41, 0x02, 67},
- {56, 0x03, 67},
- {3, 0x02, 68},
- {6, 0x02, 68},
- {10, 0x02, 68},
- {15, 0x02, 68},
- {24, 0x02, 68},
- {31, 0x02, 68},
- {41, 0x02, 68},
- {56, 0x03, 68},
+ {0x8003, 67},
+ {0x8006, 67},
+ {0x800a, 67},
+ {0x800f, 67},
+ {0x8018, 67},
+ {0x801f, 67},
+ {0x8029, 67},
+ {0xc038, 67},
+ {0x8003, 68},
+ {0x8006, 68},
+ {0x800a, 68},
+ {0x800f, 68},
+ {0x8018, 68},
+ {0x801f, 68},
+ {0x8029, 68},
+ {0xc038, 68},
},
/* 40 */
{
- {44, 0x00, 0},
- {45, 0x00, 0},
- {47, 0x00, 0},
- {48, 0x00, 0},
- {51, 0x00, 0},
- {52, 0x00, 0},
- {54, 0x00, 0},
- {55, 0x00, 0},
- {59, 0x00, 0},
- {60, 0x00, 0},
- {62, 0x00, 0},
- {63, 0x00, 0},
- {66, 0x00, 0},
- {67, 0x00, 0},
- {69, 0x00, 0},
- {72, 0x01, 0},
+ {0x2c, 0},
+ {0x2d, 0},
+ {0x2f, 0},
+ {0x30, 0},
+ {0x33, 0},
+ {0x34, 0},
+ {0x36, 0},
+ {0x37, 0},
+ {0x3b, 0},
+ {0x3c, 0},
+ {0x3e, 0},
+ {0x3f, 0},
+ {0x42, 0},
+ {0x43, 0},
+ {0x45, 0},
+ {0x4048, 0},
},
/* 41 */
{
- {0, 0x03, 69},
- {0, 0x03, 70},
- {0, 0x03, 71},
- {0, 0x03, 72},
- {0, 0x03, 73},
- {0, 0x03, 74},
- {0, 0x03, 75},
- {0, 0x03, 76},
- {0, 0x03, 77},
- {0, 0x03, 78},
- {0, 0x03, 79},
- {0, 0x03, 80},
- {0, 0x03, 81},
- {0, 0x03, 82},
- {0, 0x03, 83},
- {0, 0x03, 84},
+ {0xc000, 69},
+ {0xc000, 70},
+ {0xc000, 71},
+ {0xc000, 72},
+ {0xc000, 73},
+ {0xc000, 74},
+ {0xc000, 75},
+ {0xc000, 76},
+ {0xc000, 77},
+ {0xc000, 78},
+ {0xc000, 79},
+ {0xc000, 80},
+ {0xc000, 81},
+ {0xc000, 82},
+ {0xc000, 83},
+ {0xc000, 84},
},
/* 42 */
{
- {1, 0x02, 69},
- {22, 0x03, 69},
- {1, 0x02, 70},
- {22, 0x03, 70},
- {1, 0x02, 71},
- {22, 0x03, 71},
- {1, 0x02, 72},
- {22, 0x03, 72},
- {1, 0x02, 73},
- {22, 0x03, 73},
- {1, 0x02, 74},
- {22, 0x03, 74},
- {1, 0x02, 75},
- {22, 0x03, 75},
- {1, 0x02, 76},
- {22, 0x03, 76},
+ {0x8001, 69},
+ {0xc016, 69},
+ {0x8001, 70},
+ {0xc016, 70},
+ {0x8001, 71},
+ {0xc016, 71},
+ {0x8001, 72},
+ {0xc016, 72},
+ {0x8001, 73},
+ {0xc016, 73},
+ {0x8001, 74},
+ {0xc016, 74},
+ {0x8001, 75},
+ {0xc016, 75},
+ {0x8001, 76},
+ {0xc016, 76},
},
/* 43 */
{
- {2, 0x02, 69},
- {9, 0x02, 69},
- {23, 0x02, 69},
- {40, 0x03, 69},
- {2, 0x02, 70},
- {9, 0x02, 70},
- {23, 0x02, 70},
- {40, 0x03, 70},
- {2, 0x02, 71},
- {9, 0x02, 71},
- {23, 0x02, 71},
- {40, 0x03, 71},
- {2, 0x02, 72},
- {9, 0x02, 72},
- {23, 0x02, 72},
- {40, 0x03, 72},
+ {0x8002, 69},
+ {0x8009, 69},
+ {0x8017, 69},
+ {0xc028, 69},
+ {0x8002, 70},
+ {0x8009, 70},
+ {0x8017, 70},
+ {0xc028, 70},
+ {0x8002, 71},
+ {0x8009, 71},
+ {0x8017, 71},
+ {0xc028, 71},
+ {0x8002, 72},
+ {0x8009, 72},
+ {0x8017, 72},
+ {0xc028, 72},
},
/* 44 */
{
- {3, 0x02, 69},
- {6, 0x02, 69},
- {10, 0x02, 69},
- {15, 0x02, 69},
- {24, 0x02, 69},
- {31, 0x02, 69},
- {41, 0x02, 69},
- {56, 0x03, 69},
- {3, 0x02, 70},
- {6, 0x02, 70},
- {10, 0x02, 70},
- {15, 0x02, 70},
- {24, 0x02, 70},
- {31, 0x02, 70},
- {41, 0x02, 70},
- {56, 0x03, 70},
+ {0x8003, 69},
+ {0x8006, 69},
+ {0x800a, 69},
+ {0x800f, 69},
+ {0x8018, 69},
+ {0x801f, 69},
+ {0x8029, 69},
+ {0xc038, 69},
+ {0x8003, 70},
+ {0x8006, 70},
+ {0x800a, 70},
+ {0x800f, 70},
+ {0x8018, 70},
+ {0x801f, 70},
+ {0x8029, 70},
+ {0xc038, 70},
},
/* 45 */
{
- {3, 0x02, 71},
- {6, 0x02, 71},
- {10, 0x02, 71},
- {15, 0x02, 71},
- {24, 0x02, 71},
- {31, 0x02, 71},
- {41, 0x02, 71},
- {56, 0x03, 71},
- {3, 0x02, 72},
- {6, 0x02, 72},
- {10, 0x02, 72},
- {15, 0x02, 72},
- {24, 0x02, 72},
- {31, 0x02, 72},
- {41, 0x02, 72},
- {56, 0x03, 72},
+ {0x8003, 71},
+ {0x8006, 71},
+ {0x800a, 71},
+ {0x800f, 71},
+ {0x8018, 71},
+ {0x801f, 71},
+ {0x8029, 71},
+ {0xc038, 71},
+ {0x8003, 72},
+ {0x8006, 72},
+ {0x800a, 72},
+ {0x800f, 72},
+ {0x8018, 72},
+ {0x801f, 72},
+ {0x8029, 72},
+ {0xc038, 72},
},
/* 46 */
{
- {2, 0x02, 73},
- {9, 0x02, 73},
- {23, 0x02, 73},
- {40, 0x03, 73},
- {2, 0x02, 74},
- {9, 0x02, 74},
- {23, 0x02, 74},
- {40, 0x03, 74},
- {2, 0x02, 75},
- {9, 0x02, 75},
- {23, 0x02, 75},
- {40, 0x03, 75},
- {2, 0x02, 76},
- {9, 0x02, 76},
- {23, 0x02, 76},
- {40, 0x03, 76},
+ {0x8002, 73},
+ {0x8009, 73},
+ {0x8017, 73},
+ {0xc028, 73},
+ {0x8002, 74},
+ {0x8009, 74},
+ {0x8017, 74},
+ {0xc028, 74},
+ {0x8002, 75},
+ {0x8009, 75},
+ {0x8017, 75},
+ {0xc028, 75},
+ {0x8002, 76},
+ {0x8009, 76},
+ {0x8017, 76},
+ {0xc028, 76},
},
/* 47 */
{
- {3, 0x02, 73},
- {6, 0x02, 73},
- {10, 0x02, 73},
- {15, 0x02, 73},
- {24, 0x02, 73},
- {31, 0x02, 73},
- {41, 0x02, 73},
- {56, 0x03, 73},
- {3, 0x02, 74},
- {6, 0x02, 74},
- {10, 0x02, 74},
- {15, 0x02, 74},
- {24, 0x02, 74},
- {31, 0x02, 74},
- {41, 0x02, 74},
- {56, 0x03, 74},
+ {0x8003, 73},
+ {0x8006, 73},
+ {0x800a, 73},
+ {0x800f, 73},
+ {0x8018, 73},
+ {0x801f, 73},
+ {0x8029, 73},
+ {0xc038, 73},
+ {0x8003, 74},
+ {0x8006, 74},
+ {0x800a, 74},
+ {0x800f, 74},
+ {0x8018, 74},
+ {0x801f, 74},
+ {0x8029, 74},
+ {0xc038, 74},
},
/* 48 */
{
- {3, 0x02, 75},
- {6, 0x02, 75},
- {10, 0x02, 75},
- {15, 0x02, 75},
- {24, 0x02, 75},
- {31, 0x02, 75},
- {41, 0x02, 75},
- {56, 0x03, 75},
- {3, 0x02, 76},
- {6, 0x02, 76},
- {10, 0x02, 76},
- {15, 0x02, 76},
- {24, 0x02, 76},
- {31, 0x02, 76},
- {41, 0x02, 76},
- {56, 0x03, 76},
+ {0x8003, 75},
+ {0x8006, 75},
+ {0x800a, 75},
+ {0x800f, 75},
+ {0x8018, 75},
+ {0x801f, 75},
+ {0x8029, 75},
+ {0xc038, 75},
+ {0x8003, 76},
+ {0x8006, 76},
+ {0x800a, 76},
+ {0x800f, 76},
+ {0x8018, 76},
+ {0x801f, 76},
+ {0x8029, 76},
+ {0xc038, 76},
},
/* 49 */
{
- {1, 0x02, 77},
- {22, 0x03, 77},
- {1, 0x02, 78},
- {22, 0x03, 78},
- {1, 0x02, 79},
- {22, 0x03, 79},
- {1, 0x02, 80},
- {22, 0x03, 80},
- {1, 0x02, 81},
- {22, 0x03, 81},
- {1, 0x02, 82},
- {22, 0x03, 82},
- {1, 0x02, 83},
- {22, 0x03, 83},
- {1, 0x02, 84},
- {22, 0x03, 84},
+ {0x8001, 77},
+ {0xc016, 77},
+ {0x8001, 78},
+ {0xc016, 78},
+ {0x8001, 79},
+ {0xc016, 79},
+ {0x8001, 80},
+ {0xc016, 80},
+ {0x8001, 81},
+ {0xc016, 81},
+ {0x8001, 82},
+ {0xc016, 82},
+ {0x8001, 83},
+ {0xc016, 83},
+ {0x8001, 84},
+ {0xc016, 84},
},
/* 50 */
{
- {2, 0x02, 77},
- {9, 0x02, 77},
- {23, 0x02, 77},
- {40, 0x03, 77},
- {2, 0x02, 78},
- {9, 0x02, 78},
- {23, 0x02, 78},
- {40, 0x03, 78},
- {2, 0x02, 79},
- {9, 0x02, 79},
- {23, 0x02, 79},
- {40, 0x03, 79},
- {2, 0x02, 80},
- {9, 0x02, 80},
- {23, 0x02, 80},
- {40, 0x03, 80},
+ {0x8002, 77},
+ {0x8009, 77},
+ {0x8017, 77},
+ {0xc028, 77},
+ {0x8002, 78},
+ {0x8009, 78},
+ {0x8017, 78},
+ {0xc028, 78},
+ {0x8002, 79},
+ {0x8009, 79},
+ {0x8017, 79},
+ {0xc028, 79},
+ {0x8002, 80},
+ {0x8009, 80},
+ {0x8017, 80},
+ {0xc028, 80},
},
/* 51 */
{
- {3, 0x02, 77},
- {6, 0x02, 77},
- {10, 0x02, 77},
- {15, 0x02, 77},
- {24, 0x02, 77},
- {31, 0x02, 77},
- {41, 0x02, 77},
- {56, 0x03, 77},
- {3, 0x02, 78},
- {6, 0x02, 78},
- {10, 0x02, 78},
- {15, 0x02, 78},
- {24, 0x02, 78},
- {31, 0x02, 78},
- {41, 0x02, 78},
- {56, 0x03, 78},
+ {0x8003, 77},
+ {0x8006, 77},
+ {0x800a, 77},
+ {0x800f, 77},
+ {0x8018, 77},
+ {0x801f, 77},
+ {0x8029, 77},
+ {0xc038, 77},
+ {0x8003, 78},
+ {0x8006, 78},
+ {0x800a, 78},
+ {0x800f, 78},
+ {0x8018, 78},
+ {0x801f, 78},
+ {0x8029, 78},
+ {0xc038, 78},
},
/* 52 */
{
- {3, 0x02, 79},
- {6, 0x02, 79},
- {10, 0x02, 79},
- {15, 0x02, 79},
- {24, 0x02, 79},
- {31, 0x02, 79},
- {41, 0x02, 79},
- {56, 0x03, 79},
- {3, 0x02, 80},
- {6, 0x02, 80},
- {10, 0x02, 80},
- {15, 0x02, 80},
- {24, 0x02, 80},
- {31, 0x02, 80},
- {41, 0x02, 80},
- {56, 0x03, 80},
+ {0x8003, 79},
+ {0x8006, 79},
+ {0x800a, 79},
+ {0x800f, 79},
+ {0x8018, 79},
+ {0x801f, 79},
+ {0x8029, 79},
+ {0xc038, 79},
+ {0x8003, 80},
+ {0x8006, 80},
+ {0x800a, 80},
+ {0x800f, 80},
+ {0x8018, 80},
+ {0x801f, 80},
+ {0x8029, 80},
+ {0xc038, 80},
},
/* 53 */
{
- {2, 0x02, 81},
- {9, 0x02, 81},
- {23, 0x02, 81},
- {40, 0x03, 81},
- {2, 0x02, 82},
- {9, 0x02, 82},
- {23, 0x02, 82},
- {40, 0x03, 82},
- {2, 0x02, 83},
- {9, 0x02, 83},
- {23, 0x02, 83},
- {40, 0x03, 83},
- {2, 0x02, 84},
- {9, 0x02, 84},
- {23, 0x02, 84},
- {40, 0x03, 84},
+ {0x8002, 81},
+ {0x8009, 81},
+ {0x8017, 81},
+ {0xc028, 81},
+ {0x8002, 82},
+ {0x8009, 82},
+ {0x8017, 82},
+ {0xc028, 82},
+ {0x8002, 83},
+ {0x8009, 83},
+ {0x8017, 83},
+ {0xc028, 83},
+ {0x8002, 84},
+ {0x8009, 84},
+ {0x8017, 84},
+ {0xc028, 84},
},
/* 54 */
{
- {3, 0x02, 81},
- {6, 0x02, 81},
- {10, 0x02, 81},
- {15, 0x02, 81},
- {24, 0x02, 81},
- {31, 0x02, 81},
- {41, 0x02, 81},
- {56, 0x03, 81},
- {3, 0x02, 82},
- {6, 0x02, 82},
- {10, 0x02, 82},
- {15, 0x02, 82},
- {24, 0x02, 82},
- {31, 0x02, 82},
- {41, 0x02, 82},
- {56, 0x03, 82},
+ {0x8003, 81},
+ {0x8006, 81},
+ {0x800a, 81},
+ {0x800f, 81},
+ {0x8018, 81},
+ {0x801f, 81},
+ {0x8029, 81},
+ {0xc038, 81},
+ {0x8003, 82},
+ {0x8006, 82},
+ {0x800a, 82},
+ {0x800f, 82},
+ {0x8018, 82},
+ {0x801f, 82},
+ {0x8029, 82},
+ {0xc038, 82},
},
/* 55 */
{
- {3, 0x02, 83},
- {6, 0x02, 83},
- {10, 0x02, 83},
- {15, 0x02, 83},
- {24, 0x02, 83},
- {31, 0x02, 83},
- {41, 0x02, 83},
- {56, 0x03, 83},
- {3, 0x02, 84},
- {6, 0x02, 84},
- {10, 0x02, 84},
- {15, 0x02, 84},
- {24, 0x02, 84},
- {31, 0x02, 84},
- {41, 0x02, 84},
- {56, 0x03, 84},
+ {0x8003, 83},
+ {0x8006, 83},
+ {0x800a, 83},
+ {0x800f, 83},
+ {0x8018, 83},
+ {0x801f, 83},
+ {0x8029, 83},
+ {0xc038, 83},
+ {0x8003, 84},
+ {0x8006, 84},
+ {0x800a, 84},
+ {0x800f, 84},
+ {0x8018, 84},
+ {0x801f, 84},
+ {0x8029, 84},
+ {0xc038, 84},
},
/* 56 */
{
- {0, 0x03, 85},
- {0, 0x03, 86},
- {0, 0x03, 87},
- {0, 0x03, 89},
- {0, 0x03, 106},
- {0, 0x03, 107},
- {0, 0x03, 113},
- {0, 0x03, 118},
- {0, 0x03, 119},
- {0, 0x03, 120},
- {0, 0x03, 121},
- {0, 0x03, 122},
- {70, 0x00, 0},
- {71, 0x00, 0},
- {73, 0x00, 0},
- {74, 0x01, 0},
+ {0xc000, 85},
+ {0xc000, 86},
+ {0xc000, 87},
+ {0xc000, 89},
+ {0xc000, 106},
+ {0xc000, 107},
+ {0xc000, 113},
+ {0xc000, 118},
+ {0xc000, 119},
+ {0xc000, 120},
+ {0xc000, 121},
+ {0xc000, 122},
+ {0x46, 0},
+ {0x47, 0},
+ {0x49, 0},
+ {0x404a, 0},
},
/* 57 */
{
- {1, 0x02, 85},
- {22, 0x03, 85},
- {1, 0x02, 86},
- {22, 0x03, 86},
- {1, 0x02, 87},
- {22, 0x03, 87},
- {1, 0x02, 89},
- {22, 0x03, 89},
- {1, 0x02, 106},
- {22, 0x03, 106},
- {1, 0x02, 107},
- {22, 0x03, 107},
- {1, 0x02, 113},
- {22, 0x03, 113},
- {1, 0x02, 118},
- {22, 0x03, 118},
+ {0x8001, 85},
+ {0xc016, 85},
+ {0x8001, 86},
+ {0xc016, 86},
+ {0x8001, 87},
+ {0xc016, 87},
+ {0x8001, 89},
+ {0xc016, 89},
+ {0x8001, 106},
+ {0xc016, 106},
+ {0x8001, 107},
+ {0xc016, 107},
+ {0x8001, 113},
+ {0xc016, 113},
+ {0x8001, 118},
+ {0xc016, 118},
},
/* 58 */
{
- {2, 0x02, 85},
- {9, 0x02, 85},
- {23, 0x02, 85},
- {40, 0x03, 85},
- {2, 0x02, 86},
- {9, 0x02, 86},
- {23, 0x02, 86},
- {40, 0x03, 86},
- {2, 0x02, 87},
- {9, 0x02, 87},
- {23, 0x02, 87},
- {40, 0x03, 87},
- {2, 0x02, 89},
- {9, 0x02, 89},
- {23, 0x02, 89},
- {40, 0x03, 89},
+ {0x8002, 85},
+ {0x8009, 85},
+ {0x8017, 85},
+ {0xc028, 85},
+ {0x8002, 86},
+ {0x8009, 86},
+ {0x8017, 86},
+ {0xc028, 86},
+ {0x8002, 87},
+ {0x8009, 87},
+ {0x8017, 87},
+ {0xc028, 87},
+ {0x8002, 89},
+ {0x8009, 89},
+ {0x8017, 89},
+ {0xc028, 89},
},
/* 59 */
{
- {3, 0x02, 85},
- {6, 0x02, 85},
- {10, 0x02, 85},
- {15, 0x02, 85},
- {24, 0x02, 85},
- {31, 0x02, 85},
- {41, 0x02, 85},
- {56, 0x03, 85},
- {3, 0x02, 86},
- {6, 0x02, 86},
- {10, 0x02, 86},
- {15, 0x02, 86},
- {24, 0x02, 86},
- {31, 0x02, 86},
- {41, 0x02, 86},
- {56, 0x03, 86},
+ {0x8003, 85},
+ {0x8006, 85},
+ {0x800a, 85},
+ {0x800f, 85},
+ {0x8018, 85},
+ {0x801f, 85},
+ {0x8029, 85},
+ {0xc038, 85},
+ {0x8003, 86},
+ {0x8006, 86},
+ {0x800a, 86},
+ {0x800f, 86},
+ {0x8018, 86},
+ {0x801f, 86},
+ {0x8029, 86},
+ {0xc038, 86},
},
/* 60 */
{
- {3, 0x02, 87},
- {6, 0x02, 87},
- {10, 0x02, 87},
- {15, 0x02, 87},
- {24, 0x02, 87},
- {31, 0x02, 87},
- {41, 0x02, 87},
- {56, 0x03, 87},
- {3, 0x02, 89},
- {6, 0x02, 89},
- {10, 0x02, 89},
- {15, 0x02, 89},
- {24, 0x02, 89},
- {31, 0x02, 89},
- {41, 0x02, 89},
- {56, 0x03, 89},
+ {0x8003, 87},
+ {0x8006, 87},
+ {0x800a, 87},
+ {0x800f, 87},
+ {0x8018, 87},
+ {0x801f, 87},
+ {0x8029, 87},
+ {0xc038, 87},
+ {0x8003, 89},
+ {0x8006, 89},
+ {0x800a, 89},
+ {0x800f, 89},
+ {0x8018, 89},
+ {0x801f, 89},
+ {0x8029, 89},
+ {0xc038, 89},
},
/* 61 */
{
- {2, 0x02, 106},
- {9, 0x02, 106},
- {23, 0x02, 106},
- {40, 0x03, 106},
- {2, 0x02, 107},
- {9, 0x02, 107},
- {23, 0x02, 107},
- {40, 0x03, 107},
- {2, 0x02, 113},
- {9, 0x02, 113},
- {23, 0x02, 113},
- {40, 0x03, 113},
- {2, 0x02, 118},
- {9, 0x02, 118},
- {23, 0x02, 118},
- {40, 0x03, 118},
+ {0x8002, 106},
+ {0x8009, 106},
+ {0x8017, 106},
+ {0xc028, 106},
+ {0x8002, 107},
+ {0x8009, 107},
+ {0x8017, 107},
+ {0xc028, 107},
+ {0x8002, 113},
+ {0x8009, 113},
+ {0x8017, 113},
+ {0xc028, 113},
+ {0x8002, 118},
+ {0x8009, 118},
+ {0x8017, 118},
+ {0xc028, 118},
},
/* 62 */
{
- {3, 0x02, 106},
- {6, 0x02, 106},
- {10, 0x02, 106},
- {15, 0x02, 106},
- {24, 0x02, 106},
- {31, 0x02, 106},
- {41, 0x02, 106},
- {56, 0x03, 106},
- {3, 0x02, 107},
- {6, 0x02, 107},
- {10, 0x02, 107},
- {15, 0x02, 107},
- {24, 0x02, 107},
- {31, 0x02, 107},
- {41, 0x02, 107},
- {56, 0x03, 107},
+ {0x8003, 106},
+ {0x8006, 106},
+ {0x800a, 106},
+ {0x800f, 106},
+ {0x8018, 106},
+ {0x801f, 106},
+ {0x8029, 106},
+ {0xc038, 106},
+ {0x8003, 107},
+ {0x8006, 107},
+ {0x800a, 107},
+ {0x800f, 107},
+ {0x8018, 107},
+ {0x801f, 107},
+ {0x8029, 107},
+ {0xc038, 107},
},
/* 63 */
{
- {3, 0x02, 113},
- {6, 0x02, 113},
- {10, 0x02, 113},
- {15, 0x02, 113},
- {24, 0x02, 113},
- {31, 0x02, 113},
- {41, 0x02, 113},
- {56, 0x03, 113},
- {3, 0x02, 118},
- {6, 0x02, 118},
- {10, 0x02, 118},
- {15, 0x02, 118},
- {24, 0x02, 118},
- {31, 0x02, 118},
- {41, 0x02, 118},
- {56, 0x03, 118},
+ {0x8003, 113},
+ {0x8006, 113},
+ {0x800a, 113},
+ {0x800f, 113},
+ {0x8018, 113},
+ {0x801f, 113},
+ {0x8029, 113},
+ {0xc038, 113},
+ {0x8003, 118},
+ {0x8006, 118},
+ {0x800a, 118},
+ {0x800f, 118},
+ {0x8018, 118},
+ {0x801f, 118},
+ {0x8029, 118},
+ {0xc038, 118},
},
/* 64 */
{
- {1, 0x02, 119},
- {22, 0x03, 119},
- {1, 0x02, 120},
- {22, 0x03, 120},
- {1, 0x02, 121},
- {22, 0x03, 121},
- {1, 0x02, 122},
- {22, 0x03, 122},
- {0, 0x03, 38},
- {0, 0x03, 42},
- {0, 0x03, 44},
- {0, 0x03, 59},
- {0, 0x03, 88},
- {0, 0x03, 90},
- {75, 0x00, 0},
- {78, 0x00, 0},
+ {0x8001, 119},
+ {0xc016, 119},
+ {0x8001, 120},
+ {0xc016, 120},
+ {0x8001, 121},
+ {0xc016, 121},
+ {0x8001, 122},
+ {0xc016, 122},
+ {0xc000, 38},
+ {0xc000, 42},
+ {0xc000, 44},
+ {0xc000, 59},
+ {0xc000, 88},
+ {0xc000, 90},
+ {0x4b, 0},
+ {0x4e, 0},
},
/* 65 */
{
- {2, 0x02, 119},
- {9, 0x02, 119},
- {23, 0x02, 119},
- {40, 0x03, 119},
- {2, 0x02, 120},
- {9, 0x02, 120},
- {23, 0x02, 120},
- {40, 0x03, 120},
- {2, 0x02, 121},
- {9, 0x02, 121},
- {23, 0x02, 121},
- {40, 0x03, 121},
- {2, 0x02, 122},
- {9, 0x02, 122},
- {23, 0x02, 122},
- {40, 0x03, 122},
+ {0x8002, 119},
+ {0x8009, 119},
+ {0x8017, 119},
+ {0xc028, 119},
+ {0x8002, 120},
+ {0x8009, 120},
+ {0x8017, 120},
+ {0xc028, 120},
+ {0x8002, 121},
+ {0x8009, 121},
+ {0x8017, 121},
+ {0xc028, 121},
+ {0x8002, 122},
+ {0x8009, 122},
+ {0x8017, 122},
+ {0xc028, 122},
},
/* 66 */
{
- {3, 0x02, 119},
- {6, 0x02, 119},
- {10, 0x02, 119},
- {15, 0x02, 119},
- {24, 0x02, 119},
- {31, 0x02, 119},
- {41, 0x02, 119},
- {56, 0x03, 119},
- {3, 0x02, 120},
- {6, 0x02, 120},
- {10, 0x02, 120},
- {15, 0x02, 120},
- {24, 0x02, 120},
- {31, 0x02, 120},
- {41, 0x02, 120},
- {56, 0x03, 120},
+ {0x8003, 119},
+ {0x8006, 119},
+ {0x800a, 119},
+ {0x800f, 119},
+ {0x8018, 119},
+ {0x801f, 119},
+ {0x8029, 119},
+ {0xc038, 119},
+ {0x8003, 120},
+ {0x8006, 120},
+ {0x800a, 120},
+ {0x800f, 120},
+ {0x8018, 120},
+ {0x801f, 120},
+ {0x8029, 120},
+ {0xc038, 120},
},
/* 67 */
{
- {3, 0x02, 121},
- {6, 0x02, 121},
- {10, 0x02, 121},
- {15, 0x02, 121},
- {24, 0x02, 121},
- {31, 0x02, 121},
- {41, 0x02, 121},
- {56, 0x03, 121},
- {3, 0x02, 122},
- {6, 0x02, 122},
- {10, 0x02, 122},
- {15, 0x02, 122},
- {24, 0x02, 122},
- {31, 0x02, 122},
- {41, 0x02, 122},
- {56, 0x03, 122},
+ {0x8003, 121},
+ {0x8006, 121},
+ {0x800a, 121},
+ {0x800f, 121},
+ {0x8018, 121},
+ {0x801f, 121},
+ {0x8029, 121},
+ {0xc038, 121},
+ {0x8003, 122},
+ {0x8006, 122},
+ {0x800a, 122},
+ {0x800f, 122},
+ {0x8018, 122},
+ {0x801f, 122},
+ {0x8029, 122},
+ {0xc038, 122},
},
/* 68 */
{
- {1, 0x02, 38},
- {22, 0x03, 38},
- {1, 0x02, 42},
- {22, 0x03, 42},
- {1, 0x02, 44},
- {22, 0x03, 44},
- {1, 0x02, 59},
- {22, 0x03, 59},
- {1, 0x02, 88},
- {22, 0x03, 88},
- {1, 0x02, 90},
- {22, 0x03, 90},
- {76, 0x00, 0},
- {77, 0x00, 0},
- {79, 0x00, 0},
- {81, 0x00, 0},
+ {0x8001, 38},
+ {0xc016, 38},
+ {0x8001, 42},
+ {0xc016, 42},
+ {0x8001, 44},
+ {0xc016, 44},
+ {0x8001, 59},
+ {0xc016, 59},
+ {0x8001, 88},
+ {0xc016, 88},
+ {0x8001, 90},
+ {0xc016, 90},
+ {0x4c, 0},
+ {0x4d, 0},
+ {0x4f, 0},
+ {0x51, 0},
},
/* 69 */
{
- {2, 0x02, 38},
- {9, 0x02, 38},
- {23, 0x02, 38},
- {40, 0x03, 38},
- {2, 0x02, 42},
- {9, 0x02, 42},
- {23, 0x02, 42},
- {40, 0x03, 42},
- {2, 0x02, 44},
- {9, 0x02, 44},
- {23, 0x02, 44},
- {40, 0x03, 44},
- {2, 0x02, 59},
- {9, 0x02, 59},
- {23, 0x02, 59},
- {40, 0x03, 59},
+ {0x8002, 38},
+ {0x8009, 38},
+ {0x8017, 38},
+ {0xc028, 38},
+ {0x8002, 42},
+ {0x8009, 42},
+ {0x8017, 42},
+ {0xc028, 42},
+ {0x8002, 44},
+ {0x8009, 44},
+ {0x8017, 44},
+ {0xc028, 44},
+ {0x8002, 59},
+ {0x8009, 59},
+ {0x8017, 59},
+ {0xc028, 59},
},
/* 70 */
{
- {3, 0x02, 38},
- {6, 0x02, 38},
- {10, 0x02, 38},
- {15, 0x02, 38},
- {24, 0x02, 38},
- {31, 0x02, 38},
- {41, 0x02, 38},
- {56, 0x03, 38},
- {3, 0x02, 42},
- {6, 0x02, 42},
- {10, 0x02, 42},
- {15, 0x02, 42},
- {24, 0x02, 42},
- {31, 0x02, 42},
- {41, 0x02, 42},
- {56, 0x03, 42},
+ {0x8003, 38},
+ {0x8006, 38},
+ {0x800a, 38},
+ {0x800f, 38},
+ {0x8018, 38},
+ {0x801f, 38},
+ {0x8029, 38},
+ {0xc038, 38},
+ {0x8003, 42},
+ {0x8006, 42},
+ {0x800a, 42},
+ {0x800f, 42},
+ {0x8018, 42},
+ {0x801f, 42},
+ {0x8029, 42},
+ {0xc038, 42},
},
/* 71 */
{
- {3, 0x02, 44},
- {6, 0x02, 44},
- {10, 0x02, 44},
- {15, 0x02, 44},
- {24, 0x02, 44},
- {31, 0x02, 44},
- {41, 0x02, 44},
- {56, 0x03, 44},
- {3, 0x02, 59},
- {6, 0x02, 59},
- {10, 0x02, 59},
- {15, 0x02, 59},
- {24, 0x02, 59},
- {31, 0x02, 59},
- {41, 0x02, 59},
- {56, 0x03, 59},
+ {0x8003, 44},
+ {0x8006, 44},
+ {0x800a, 44},
+ {0x800f, 44},
+ {0x8018, 44},
+ {0x801f, 44},
+ {0x8029, 44},
+ {0xc038, 44},
+ {0x8003, 59},
+ {0x8006, 59},
+ {0x800a, 59},
+ {0x800f, 59},
+ {0x8018, 59},
+ {0x801f, 59},
+ {0x8029, 59},
+ {0xc038, 59},
},
/* 72 */
{
- {2, 0x02, 88},
- {9, 0x02, 88},
- {23, 0x02, 88},
- {40, 0x03, 88},
- {2, 0x02, 90},
- {9, 0x02, 90},
- {23, 0x02, 90},
- {40, 0x03, 90},
- {0, 0x03, 33},
- {0, 0x03, 34},
- {0, 0x03, 40},
- {0, 0x03, 41},
- {0, 0x03, 63},
- {80, 0x00, 0},
- {82, 0x00, 0},
- {84, 0x00, 0},
+ {0x8002, 88},
+ {0x8009, 88},
+ {0x8017, 88},
+ {0xc028, 88},
+ {0x8002, 90},
+ {0x8009, 90},
+ {0x8017, 90},
+ {0xc028, 90},
+ {0xc000, 33},
+ {0xc000, 34},
+ {0xc000, 40},
+ {0xc000, 41},
+ {0xc000, 63},
+ {0x50, 0},
+ {0x52, 0},
+ {0x54, 0},
},
/* 73 */
{
- {3, 0x02, 88},
- {6, 0x02, 88},
- {10, 0x02, 88},
- {15, 0x02, 88},
- {24, 0x02, 88},
- {31, 0x02, 88},
- {41, 0x02, 88},
- {56, 0x03, 88},
- {3, 0x02, 90},
- {6, 0x02, 90},
- {10, 0x02, 90},
- {15, 0x02, 90},
- {24, 0x02, 90},
- {31, 0x02, 90},
- {41, 0x02, 90},
- {56, 0x03, 90},
+ {0x8003, 88},
+ {0x8006, 88},
+ {0x800a, 88},
+ {0x800f, 88},
+ {0x8018, 88},
+ {0x801f, 88},
+ {0x8029, 88},
+ {0xc038, 88},
+ {0x8003, 90},
+ {0x8006, 90},
+ {0x800a, 90},
+ {0x800f, 90},
+ {0x8018, 90},
+ {0x801f, 90},
+ {0x8029, 90},
+ {0xc038, 90},
},
/* 74 */
{
- {1, 0x02, 33},
- {22, 0x03, 33},
- {1, 0x02, 34},
- {22, 0x03, 34},
- {1, 0x02, 40},
- {22, 0x03, 40},
- {1, 0x02, 41},
- {22, 0x03, 41},
- {1, 0x02, 63},
- {22, 0x03, 63},
- {0, 0x03, 39},
- {0, 0x03, 43},
- {0, 0x03, 124},
- {83, 0x00, 0},
- {85, 0x00, 0},
- {88, 0x00, 0},
+ {0x8001, 33},
+ {0xc016, 33},
+ {0x8001, 34},
+ {0xc016, 34},
+ {0x8001, 40},
+ {0xc016, 40},
+ {0x8001, 41},
+ {0xc016, 41},
+ {0x8001, 63},
+ {0xc016, 63},
+ {0xc000, 39},
+ {0xc000, 43},
+ {0xc000, 124},
+ {0x53, 0},
+ {0x55, 0},
+ {0x58, 0},
},
/* 75 */
{
- {2, 0x02, 33},
- {9, 0x02, 33},
- {23, 0x02, 33},
- {40, 0x03, 33},
- {2, 0x02, 34},
- {9, 0x02, 34},
- {23, 0x02, 34},
- {40, 0x03, 34},
- {2, 0x02, 40},
- {9, 0x02, 40},
- {23, 0x02, 40},
- {40, 0x03, 40},
- {2, 0x02, 41},
- {9, 0x02, 41},
- {23, 0x02, 41},
- {40, 0x03, 41},
+ {0x8002, 33},
+ {0x8009, 33},
+ {0x8017, 33},
+ {0xc028, 33},
+ {0x8002, 34},
+ {0x8009, 34},
+ {0x8017, 34},
+ {0xc028, 34},
+ {0x8002, 40},
+ {0x8009, 40},
+ {0x8017, 40},
+ {0xc028, 40},
+ {0x8002, 41},
+ {0x8009, 41},
+ {0x8017, 41},
+ {0xc028, 41},
},
/* 76 */
{
- {3, 0x02, 33},
- {6, 0x02, 33},
- {10, 0x02, 33},
- {15, 0x02, 33},
- {24, 0x02, 33},
- {31, 0x02, 33},
- {41, 0x02, 33},
- {56, 0x03, 33},
- {3, 0x02, 34},
- {6, 0x02, 34},
- {10, 0x02, 34},
- {15, 0x02, 34},
- {24, 0x02, 34},
- {31, 0x02, 34},
- {41, 0x02, 34},
- {56, 0x03, 34},
+ {0x8003, 33},
+ {0x8006, 33},
+ {0x800a, 33},
+ {0x800f, 33},
+ {0x8018, 33},
+ {0x801f, 33},
+ {0x8029, 33},
+ {0xc038, 33},
+ {0x8003, 34},
+ {0x8006, 34},
+ {0x800a, 34},
+ {0x800f, 34},
+ {0x8018, 34},
+ {0x801f, 34},
+ {0x8029, 34},
+ {0xc038, 34},
},
/* 77 */
{
- {3, 0x02, 40},
- {6, 0x02, 40},
- {10, 0x02, 40},
- {15, 0x02, 40},
- {24, 0x02, 40},
- {31, 0x02, 40},
- {41, 0x02, 40},
- {56, 0x03, 40},
- {3, 0x02, 41},
- {6, 0x02, 41},
- {10, 0x02, 41},
- {15, 0x02, 41},
- {24, 0x02, 41},
- {31, 0x02, 41},
- {41, 0x02, 41},
- {56, 0x03, 41},
+ {0x8003, 40},
+ {0x8006, 40},
+ {0x800a, 40},
+ {0x800f, 40},
+ {0x8018, 40},
+ {0x801f, 40},
+ {0x8029, 40},
+ {0xc038, 40},
+ {0x8003, 41},
+ {0x8006, 41},
+ {0x800a, 41},
+ {0x800f, 41},
+ {0x8018, 41},
+ {0x801f, 41},
+ {0x8029, 41},
+ {0xc038, 41},
},
/* 78 */
{
- {2, 0x02, 63},
- {9, 0x02, 63},
- {23, 0x02, 63},
- {40, 0x03, 63},
- {1, 0x02, 39},
- {22, 0x03, 39},
- {1, 0x02, 43},
- {22, 0x03, 43},
- {1, 0x02, 124},
- {22, 0x03, 124},
- {0, 0x03, 35},
- {0, 0x03, 62},
- {86, 0x00, 0},
- {87, 0x00, 0},
- {89, 0x00, 0},
- {90, 0x00, 0},
+ {0x8002, 63},
+ {0x8009, 63},
+ {0x8017, 63},
+ {0xc028, 63},
+ {0x8001, 39},
+ {0xc016, 39},
+ {0x8001, 43},
+ {0xc016, 43},
+ {0x8001, 124},
+ {0xc016, 124},
+ {0xc000, 35},
+ {0xc000, 62},
+ {0x56, 0},
+ {0x57, 0},
+ {0x59, 0},
+ {0x5a, 0},
},
/* 79 */
{
- {3, 0x02, 63},
- {6, 0x02, 63},
- {10, 0x02, 63},
- {15, 0x02, 63},
- {24, 0x02, 63},
- {31, 0x02, 63},
- {41, 0x02, 63},
- {56, 0x03, 63},
- {2, 0x02, 39},
- {9, 0x02, 39},
- {23, 0x02, 39},
- {40, 0x03, 39},
- {2, 0x02, 43},
- {9, 0x02, 43},
- {23, 0x02, 43},
- {40, 0x03, 43},
+ {0x8003, 63},
+ {0x8006, 63},
+ {0x800a, 63},
+ {0x800f, 63},
+ {0x8018, 63},
+ {0x801f, 63},
+ {0x8029, 63},
+ {0xc038, 63},
+ {0x8002, 39},
+ {0x8009, 39},
+ {0x8017, 39},
+ {0xc028, 39},
+ {0x8002, 43},
+ {0x8009, 43},
+ {0x8017, 43},
+ {0xc028, 43},
},
/* 80 */
{
- {3, 0x02, 39},
- {6, 0x02, 39},
- {10, 0x02, 39},
- {15, 0x02, 39},
- {24, 0x02, 39},
- {31, 0x02, 39},
- {41, 0x02, 39},
- {56, 0x03, 39},
- {3, 0x02, 43},
- {6, 0x02, 43},
- {10, 0x02, 43},
- {15, 0x02, 43},
- {24, 0x02, 43},
- {31, 0x02, 43},
- {41, 0x02, 43},
- {56, 0x03, 43},
+ {0x8003, 39},
+ {0x8006, 39},
+ {0x800a, 39},
+ {0x800f, 39},
+ {0x8018, 39},
+ {0x801f, 39},
+ {0x8029, 39},
+ {0xc038, 39},
+ {0x8003, 43},
+ {0x8006, 43},
+ {0x800a, 43},
+ {0x800f, 43},
+ {0x8018, 43},
+ {0x801f, 43},
+ {0x8029, 43},
+ {0xc038, 43},
},
/* 81 */
{
- {2, 0x02, 124},
- {9, 0x02, 124},
- {23, 0x02, 124},
- {40, 0x03, 124},
- {1, 0x02, 35},
- {22, 0x03, 35},
- {1, 0x02, 62},
- {22, 0x03, 62},
- {0, 0x03, 0},
- {0, 0x03, 36},
- {0, 0x03, 64},
- {0, 0x03, 91},
- {0, 0x03, 93},
- {0, 0x03, 126},
- {91, 0x00, 0},
- {92, 0x00, 0},
+ {0x8002, 124},
+ {0x8009, 124},
+ {0x8017, 124},
+ {0xc028, 124},
+ {0x8001, 35},
+ {0xc016, 35},
+ {0x8001, 62},
+ {0xc016, 62},
+ {0xc000, 0},
+ {0xc000, 36},
+ {0xc000, 64},
+ {0xc000, 91},
+ {0xc000, 93},
+ {0xc000, 126},
+ {0x5b, 0},
+ {0x5c, 0},
},
/* 82 */
{
- {3, 0x02, 124},
- {6, 0x02, 124},
- {10, 0x02, 124},
- {15, 0x02, 124},
- {24, 0x02, 124},
- {31, 0x02, 124},
- {41, 0x02, 124},
- {56, 0x03, 124},
- {2, 0x02, 35},
- {9, 0x02, 35},
- {23, 0x02, 35},
- {40, 0x03, 35},
- {2, 0x02, 62},
- {9, 0x02, 62},
- {23, 0x02, 62},
- {40, 0x03, 62},
+ {0x8003, 124},
+ {0x8006, 124},
+ {0x800a, 124},
+ {0x800f, 124},
+ {0x8018, 124},
+ {0x801f, 124},
+ {0x8029, 124},
+ {0xc038, 124},
+ {0x8002, 35},
+ {0x8009, 35},
+ {0x8017, 35},
+ {0xc028, 35},
+ {0x8002, 62},
+ {0x8009, 62},
+ {0x8017, 62},
+ {0xc028, 62},
},
/* 83 */
{
- {3, 0x02, 35},
- {6, 0x02, 35},
- {10, 0x02, 35},
- {15, 0x02, 35},
- {24, 0x02, 35},
- {31, 0x02, 35},
- {41, 0x02, 35},
- {56, 0x03, 35},
- {3, 0x02, 62},
- {6, 0x02, 62},
- {10, 0x02, 62},
- {15, 0x02, 62},
- {24, 0x02, 62},
- {31, 0x02, 62},
- {41, 0x02, 62},
- {56, 0x03, 62},
+ {0x8003, 35},
+ {0x8006, 35},
+ {0x800a, 35},
+ {0x800f, 35},
+ {0x8018, 35},
+ {0x801f, 35},
+ {0x8029, 35},
+ {0xc038, 35},
+ {0x8003, 62},
+ {0x8006, 62},
+ {0x800a, 62},
+ {0x800f, 62},
+ {0x8018, 62},
+ {0x801f, 62},
+ {0x8029, 62},
+ {0xc038, 62},
},
/* 84 */
{
- {1, 0x02, 0},
- {22, 0x03, 0},
- {1, 0x02, 36},
- {22, 0x03, 36},
- {1, 0x02, 64},
- {22, 0x03, 64},
- {1, 0x02, 91},
- {22, 0x03, 91},
- {1, 0x02, 93},
- {22, 0x03, 93},
- {1, 0x02, 126},
- {22, 0x03, 126},
- {0, 0x03, 94},
- {0, 0x03, 125},
- {93, 0x00, 0},
- {94, 0x00, 0},
+ {0x8001, 0},
+ {0xc016, 0},
+ {0x8001, 36},
+ {0xc016, 36},
+ {0x8001, 64},
+ {0xc016, 64},
+ {0x8001, 91},
+ {0xc016, 91},
+ {0x8001, 93},
+ {0xc016, 93},
+ {0x8001, 126},
+ {0xc016, 126},
+ {0xc000, 94},
+ {0xc000, 125},
+ {0x5d, 0},
+ {0x5e, 0},
},
/* 85 */
{
- {2, 0x02, 0},
- {9, 0x02, 0},
- {23, 0x02, 0},
- {40, 0x03, 0},
- {2, 0x02, 36},
- {9, 0x02, 36},
- {23, 0x02, 36},
- {40, 0x03, 36},
- {2, 0x02, 64},
- {9, 0x02, 64},
- {23, 0x02, 64},
- {40, 0x03, 64},
- {2, 0x02, 91},
- {9, 0x02, 91},
- {23, 0x02, 91},
- {40, 0x03, 91},
+ {0x8002, 0},
+ {0x8009, 0},
+ {0x8017, 0},
+ {0xc028, 0},
+ {0x8002, 36},
+ {0x8009, 36},
+ {0x8017, 36},
+ {0xc028, 36},
+ {0x8002, 64},
+ {0x8009, 64},
+ {0x8017, 64},
+ {0xc028, 64},
+ {0x8002, 91},
+ {0x8009, 91},
+ {0x8017, 91},
+ {0xc028, 91},
},
/* 86 */
{
- {3, 0x02, 0},
- {6, 0x02, 0},
- {10, 0x02, 0},
- {15, 0x02, 0},
- {24, 0x02, 0},
- {31, 0x02, 0},
- {41, 0x02, 0},
- {56, 0x03, 0},
- {3, 0x02, 36},
- {6, 0x02, 36},
- {10, 0x02, 36},
- {15, 0x02, 36},
- {24, 0x02, 36},
- {31, 0x02, 36},
- {41, 0x02, 36},
- {56, 0x03, 36},
+ {0x8003, 0},
+ {0x8006, 0},
+ {0x800a, 0},
+ {0x800f, 0},
+ {0x8018, 0},
+ {0x801f, 0},
+ {0x8029, 0},
+ {0xc038, 0},
+ {0x8003, 36},
+ {0x8006, 36},
+ {0x800a, 36},
+ {0x800f, 36},
+ {0x8018, 36},
+ {0x801f, 36},
+ {0x8029, 36},
+ {0xc038, 36},
},
/* 87 */
{
- {3, 0x02, 64},
- {6, 0x02, 64},
- {10, 0x02, 64},
- {15, 0x02, 64},
- {24, 0x02, 64},
- {31, 0x02, 64},
- {41, 0x02, 64},
- {56, 0x03, 64},
- {3, 0x02, 91},
- {6, 0x02, 91},
- {10, 0x02, 91},
- {15, 0x02, 91},
- {24, 0x02, 91},
- {31, 0x02, 91},
- {41, 0x02, 91},
- {56, 0x03, 91},
+ {0x8003, 64},
+ {0x8006, 64},
+ {0x800a, 64},
+ {0x800f, 64},
+ {0x8018, 64},
+ {0x801f, 64},
+ {0x8029, 64},
+ {0xc038, 64},
+ {0x8003, 91},
+ {0x8006, 91},
+ {0x800a, 91},
+ {0x800f, 91},
+ {0x8018, 91},
+ {0x801f, 91},
+ {0x8029, 91},
+ {0xc038, 91},
},
/* 88 */
{
- {2, 0x02, 93},
- {9, 0x02, 93},
- {23, 0x02, 93},
- {40, 0x03, 93},
- {2, 0x02, 126},
- {9, 0x02, 126},
- {23, 0x02, 126},
- {40, 0x03, 126},
- {1, 0x02, 94},
- {22, 0x03, 94},
- {1, 0x02, 125},
- {22, 0x03, 125},
- {0, 0x03, 60},
- {0, 0x03, 96},
- {0, 0x03, 123},
- {95, 0x00, 0},
+ {0x8002, 93},
+ {0x8009, 93},
+ {0x8017, 93},
+ {0xc028, 93},
+ {0x8002, 126},
+ {0x8009, 126},
+ {0x8017, 126},
+ {0xc028, 126},
+ {0x8001, 94},
+ {0xc016, 94},
+ {0x8001, 125},
+ {0xc016, 125},
+ {0xc000, 60},
+ {0xc000, 96},
+ {0xc000, 123},
+ {0x5f, 0},
},
/* 89 */
{
- {3, 0x02, 93},
- {6, 0x02, 93},
- {10, 0x02, 93},
- {15, 0x02, 93},
- {24, 0x02, 93},
- {31, 0x02, 93},
- {41, 0x02, 93},
- {56, 0x03, 93},
- {3, 0x02, 126},
- {6, 0x02, 126},
- {10, 0x02, 126},
- {15, 0x02, 126},
- {24, 0x02, 126},
- {31, 0x02, 126},
- {41, 0x02, 126},
- {56, 0x03, 126},
+ {0x8003, 93},
+ {0x8006, 93},
+ {0x800a, 93},
+ {0x800f, 93},
+ {0x8018, 93},
+ {0x801f, 93},
+ {0x8029, 93},
+ {0xc038, 93},
+ {0x8003, 126},
+ {0x8006, 126},
+ {0x800a, 126},
+ {0x800f, 126},
+ {0x8018, 126},
+ {0x801f, 126},
+ {0x8029, 126},
+ {0xc038, 126},
},
/* 90 */
{
- {2, 0x02, 94},
- {9, 0x02, 94},
- {23, 0x02, 94},
- {40, 0x03, 94},
- {2, 0x02, 125},
- {9, 0x02, 125},
- {23, 0x02, 125},
- {40, 0x03, 125},
- {1, 0x02, 60},
- {22, 0x03, 60},
- {1, 0x02, 96},
- {22, 0x03, 96},
- {1, 0x02, 123},
- {22, 0x03, 123},
- {96, 0x00, 0},
- {110, 0x00, 0},
+ {0x8002, 94},
+ {0x8009, 94},
+ {0x8017, 94},
+ {0xc028, 94},
+ {0x8002, 125},
+ {0x8009, 125},
+ {0x8017, 125},
+ {0xc028, 125},
+ {0x8001, 60},
+ {0xc016, 60},
+ {0x8001, 96},
+ {0xc016, 96},
+ {0x8001, 123},
+ {0xc016, 123},
+ {0x60, 0},
+ {0x6e, 0},
},
/* 91 */
{
- {3, 0x02, 94},
- {6, 0x02, 94},
- {10, 0x02, 94},
- {15, 0x02, 94},
- {24, 0x02, 94},
- {31, 0x02, 94},
- {41, 0x02, 94},
- {56, 0x03, 94},
- {3, 0x02, 125},
- {6, 0x02, 125},
- {10, 0x02, 125},
- {15, 0x02, 125},
- {24, 0x02, 125},
- {31, 0x02, 125},
- {41, 0x02, 125},
- {56, 0x03, 125},
+ {0x8003, 94},
+ {0x8006, 94},
+ {0x800a, 94},
+ {0x800f, 94},
+ {0x8018, 94},
+ {0x801f, 94},
+ {0x8029, 94},
+ {0xc038, 94},
+ {0x8003, 125},
+ {0x8006, 125},
+ {0x800a, 125},
+ {0x800f, 125},
+ {0x8018, 125},
+ {0x801f, 125},
+ {0x8029, 125},
+ {0xc038, 125},
},
/* 92 */
{
- {2, 0x02, 60},
- {9, 0x02, 60},
- {23, 0x02, 60},
- {40, 0x03, 60},
- {2, 0x02, 96},
- {9, 0x02, 96},
- {23, 0x02, 96},
- {40, 0x03, 96},
- {2, 0x02, 123},
- {9, 0x02, 123},
- {23, 0x02, 123},
- {40, 0x03, 123},
- {97, 0x00, 0},
- {101, 0x00, 0},
- {111, 0x00, 0},
- {133, 0x00, 0},
+ {0x8002, 60},
+ {0x8009, 60},
+ {0x8017, 60},
+ {0xc028, 60},
+ {0x8002, 96},
+ {0x8009, 96},
+ {0x8017, 96},
+ {0xc028, 96},
+ {0x8002, 123},
+ {0x8009, 123},
+ {0x8017, 123},
+ {0xc028, 123},
+ {0x61, 0},
+ {0x65, 0},
+ {0x6f, 0},
+ {0x85, 0},
},
/* 93 */
{
- {3, 0x02, 60},
- {6, 0x02, 60},
- {10, 0x02, 60},
- {15, 0x02, 60},
- {24, 0x02, 60},
- {31, 0x02, 60},
- {41, 0x02, 60},
- {56, 0x03, 60},
- {3, 0x02, 96},
- {6, 0x02, 96},
- {10, 0x02, 96},
- {15, 0x02, 96},
- {24, 0x02, 96},
- {31, 0x02, 96},
- {41, 0x02, 96},
- {56, 0x03, 96},
+ {0x8003, 60},
+ {0x8006, 60},
+ {0x800a, 60},
+ {0x800f, 60},
+ {0x8018, 60},
+ {0x801f, 60},
+ {0x8029, 60},
+ {0xc038, 60},
+ {0x8003, 96},
+ {0x8006, 96},
+ {0x800a, 96},
+ {0x800f, 96},
+ {0x8018, 96},
+ {0x801f, 96},
+ {0x8029, 96},
+ {0xc038, 96},
},
/* 94 */
{
- {3, 0x02, 123},
- {6, 0x02, 123},
- {10, 0x02, 123},
- {15, 0x02, 123},
- {24, 0x02, 123},
- {31, 0x02, 123},
- {41, 0x02, 123},
- {56, 0x03, 123},
- {98, 0x00, 0},
- {99, 0x00, 0},
- {102, 0x00, 0},
- {105, 0x00, 0},
- {112, 0x00, 0},
- {119, 0x00, 0},
- {134, 0x00, 0},
- {153, 0x00, 0},
+ {0x8003, 123},
+ {0x8006, 123},
+ {0x800a, 123},
+ {0x800f, 123},
+ {0x8018, 123},
+ {0x801f, 123},
+ {0x8029, 123},
+ {0xc038, 123},
+ {0x62, 0},
+ {0x63, 0},
+ {0x66, 0},
+ {0x69, 0},
+ {0x70, 0},
+ {0x77, 0},
+ {0x86, 0},
+ {0x99, 0},
},
/* 95 */
{
- {0, 0x03, 92},
- {0, 0x03, 195},
- {0, 0x03, 208},
- {100, 0x00, 0},
- {103, 0x00, 0},
- {104, 0x00, 0},
- {106, 0x00, 0},
- {107, 0x00, 0},
- {113, 0x00, 0},
- {116, 0x00, 0},
- {120, 0x00, 0},
- {126, 0x00, 0},
- {135, 0x00, 0},
- {142, 0x00, 0},
- {154, 0x00, 0},
- {169, 0x00, 0},
+ {0xc000, 92},
+ {0xc000, 195},
+ {0xc000, 208},
+ {0x64, 0},
+ {0x67, 0},
+ {0x68, 0},
+ {0x6a, 0},
+ {0x6b, 0},
+ {0x71, 0},
+ {0x74, 0},
+ {0x78, 0},
+ {0x7e, 0},
+ {0x87, 0},
+ {0x8e, 0},
+ {0x9a, 0},
+ {0xa9, 0},
},
/* 96 */
{
- {1, 0x02, 92},
- {22, 0x03, 92},
- {1, 0x02, 195},
- {22, 0x03, 195},
- {1, 0x02, 208},
- {22, 0x03, 208},
- {0, 0x03, 128},
- {0, 0x03, 130},
- {0, 0x03, 131},
- {0, 0x03, 162},
- {0, 0x03, 184},
- {0, 0x03, 194},
- {0, 0x03, 224},
- {0, 0x03, 226},
- {108, 0x00, 0},
- {109, 0x00, 0},
+ {0x8001, 92},
+ {0xc016, 92},
+ {0x8001, 195},
+ {0xc016, 195},
+ {0x8001, 208},
+ {0xc016, 208},
+ {0xc000, 128},
+ {0xc000, 130},
+ {0xc000, 131},
+ {0xc000, 162},
+ {0xc000, 184},
+ {0xc000, 194},
+ {0xc000, 224},
+ {0xc000, 226},
+ {0x6c, 0},
+ {0x6d, 0},
},
/* 97 */
{
- {2, 0x02, 92},
- {9, 0x02, 92},
- {23, 0x02, 92},
- {40, 0x03, 92},
- {2, 0x02, 195},
- {9, 0x02, 195},
- {23, 0x02, 195},
- {40, 0x03, 195},
- {2, 0x02, 208},
- {9, 0x02, 208},
- {23, 0x02, 208},
- {40, 0x03, 208},
- {1, 0x02, 128},
- {22, 0x03, 128},
- {1, 0x02, 130},
- {22, 0x03, 130},
+ {0x8002, 92},
+ {0x8009, 92},
+ {0x8017, 92},
+ {0xc028, 92},
+ {0x8002, 195},
+ {0x8009, 195},
+ {0x8017, 195},
+ {0xc028, 195},
+ {0x8002, 208},
+ {0x8009, 208},
+ {0x8017, 208},
+ {0xc028, 208},
+ {0x8001, 128},
+ {0xc016, 128},
+ {0x8001, 130},
+ {0xc016, 130},
},
/* 98 */
{
- {3, 0x02, 92},
- {6, 0x02, 92},
- {10, 0x02, 92},
- {15, 0x02, 92},
- {24, 0x02, 92},
- {31, 0x02, 92},
- {41, 0x02, 92},
- {56, 0x03, 92},
- {3, 0x02, 195},
- {6, 0x02, 195},
- {10, 0x02, 195},
- {15, 0x02, 195},
- {24, 0x02, 195},
- {31, 0x02, 195},
- {41, 0x02, 195},
- {56, 0x03, 195},
+ {0x8003, 92},
+ {0x8006, 92},
+ {0x800a, 92},
+ {0x800f, 92},
+ {0x8018, 92},
+ {0x801f, 92},
+ {0x8029, 92},
+ {0xc038, 92},
+ {0x8003, 195},
+ {0x8006, 195},
+ {0x800a, 195},
+ {0x800f, 195},
+ {0x8018, 195},
+ {0x801f, 195},
+ {0x8029, 195},
+ {0xc038, 195},
},
/* 99 */
{
- {3, 0x02, 208},
- {6, 0x02, 208},
- {10, 0x02, 208},
- {15, 0x02, 208},
- {24, 0x02, 208},
- {31, 0x02, 208},
- {41, 0x02, 208},
- {56, 0x03, 208},
- {2, 0x02, 128},
- {9, 0x02, 128},
- {23, 0x02, 128},
- {40, 0x03, 128},
- {2, 0x02, 130},
- {9, 0x02, 130},
- {23, 0x02, 130},
- {40, 0x03, 130},
+ {0x8003, 208},
+ {0x8006, 208},
+ {0x800a, 208},
+ {0x800f, 208},
+ {0x8018, 208},
+ {0x801f, 208},
+ {0x8029, 208},
+ {0xc038, 208},
+ {0x8002, 128},
+ {0x8009, 128},
+ {0x8017, 128},
+ {0xc028, 128},
+ {0x8002, 130},
+ {0x8009, 130},
+ {0x8017, 130},
+ {0xc028, 130},
},
/* 100 */
{
- {3, 0x02, 128},
- {6, 0x02, 128},
- {10, 0x02, 128},
- {15, 0x02, 128},
- {24, 0x02, 128},
- {31, 0x02, 128},
- {41, 0x02, 128},
- {56, 0x03, 128},
- {3, 0x02, 130},
- {6, 0x02, 130},
- {10, 0x02, 130},
- {15, 0x02, 130},
- {24, 0x02, 130},
- {31, 0x02, 130},
- {41, 0x02, 130},
- {56, 0x03, 130},
+ {0x8003, 128},
+ {0x8006, 128},
+ {0x800a, 128},
+ {0x800f, 128},
+ {0x8018, 128},
+ {0x801f, 128},
+ {0x8029, 128},
+ {0xc038, 128},
+ {0x8003, 130},
+ {0x8006, 130},
+ {0x800a, 130},
+ {0x800f, 130},
+ {0x8018, 130},
+ {0x801f, 130},
+ {0x8029, 130},
+ {0xc038, 130},
},
/* 101 */
{
- {1, 0x02, 131},
- {22, 0x03, 131},
- {1, 0x02, 162},
- {22, 0x03, 162},
- {1, 0x02, 184},
- {22, 0x03, 184},
- {1, 0x02, 194},
- {22, 0x03, 194},
- {1, 0x02, 224},
- {22, 0x03, 224},
- {1, 0x02, 226},
- {22, 0x03, 226},
- {0, 0x03, 153},
- {0, 0x03, 161},
- {0, 0x03, 167},
- {0, 0x03, 172},
+ {0x8001, 131},
+ {0xc016, 131},
+ {0x8001, 162},
+ {0xc016, 162},
+ {0x8001, 184},
+ {0xc016, 184},
+ {0x8001, 194},
+ {0xc016, 194},
+ {0x8001, 224},
+ {0xc016, 224},
+ {0x8001, 226},
+ {0xc016, 226},
+ {0xc000, 153},
+ {0xc000, 161},
+ {0xc000, 167},
+ {0xc000, 172},
},
/* 102 */
{
- {2, 0x02, 131},
- {9, 0x02, 131},
- {23, 0x02, 131},
- {40, 0x03, 131},
- {2, 0x02, 162},
- {9, 0x02, 162},
- {23, 0x02, 162},
- {40, 0x03, 162},
- {2, 0x02, 184},
- {9, 0x02, 184},
- {23, 0x02, 184},
- {40, 0x03, 184},
- {2, 0x02, 194},
- {9, 0x02, 194},
- {23, 0x02, 194},
- {40, 0x03, 194},
+ {0x8002, 131},
+ {0x8009, 131},
+ {0x8017, 131},
+ {0xc028, 131},
+ {0x8002, 162},
+ {0x8009, 162},
+ {0x8017, 162},
+ {0xc028, 162},
+ {0x8002, 184},
+ {0x8009, 184},
+ {0x8017, 184},
+ {0xc028, 184},
+ {0x8002, 194},
+ {0x8009, 194},
+ {0x8017, 194},
+ {0xc028, 194},
},
/* 103 */
{
- {3, 0x02, 131},
- {6, 0x02, 131},
- {10, 0x02, 131},
- {15, 0x02, 131},
- {24, 0x02, 131},
- {31, 0x02, 131},
- {41, 0x02, 131},
- {56, 0x03, 131},
- {3, 0x02, 162},
- {6, 0x02, 162},
- {10, 0x02, 162},
- {15, 0x02, 162},
- {24, 0x02, 162},
- {31, 0x02, 162},
- {41, 0x02, 162},
- {56, 0x03, 162},
+ {0x8003, 131},
+ {0x8006, 131},
+ {0x800a, 131},
+ {0x800f, 131},
+ {0x8018, 131},
+ {0x801f, 131},
+ {0x8029, 131},
+ {0xc038, 131},
+ {0x8003, 162},
+ {0x8006, 162},
+ {0x800a, 162},
+ {0x800f, 162},
+ {0x8018, 162},
+ {0x801f, 162},
+ {0x8029, 162},
+ {0xc038, 162},
},
/* 104 */
{
- {3, 0x02, 184},
- {6, 0x02, 184},
- {10, 0x02, 184},
- {15, 0x02, 184},
- {24, 0x02, 184},
- {31, 0x02, 184},
- {41, 0x02, 184},
- {56, 0x03, 184},
- {3, 0x02, 194},
- {6, 0x02, 194},
- {10, 0x02, 194},
- {15, 0x02, 194},
- {24, 0x02, 194},
- {31, 0x02, 194},
- {41, 0x02, 194},
- {56, 0x03, 194},
+ {0x8003, 184},
+ {0x8006, 184},
+ {0x800a, 184},
+ {0x800f, 184},
+ {0x8018, 184},
+ {0x801f, 184},
+ {0x8029, 184},
+ {0xc038, 184},
+ {0x8003, 194},
+ {0x8006, 194},
+ {0x800a, 194},
+ {0x800f, 194},
+ {0x8018, 194},
+ {0x801f, 194},
+ {0x8029, 194},
+ {0xc038, 194},
},
/* 105 */
{
- {2, 0x02, 224},
- {9, 0x02, 224},
- {23, 0x02, 224},
- {40, 0x03, 224},
- {2, 0x02, 226},
- {9, 0x02, 226},
- {23, 0x02, 226},
- {40, 0x03, 226},
- {1, 0x02, 153},
- {22, 0x03, 153},
- {1, 0x02, 161},
- {22, 0x03, 161},
- {1, 0x02, 167},
- {22, 0x03, 167},
- {1, 0x02, 172},
- {22, 0x03, 172},
+ {0x8002, 224},
+ {0x8009, 224},
+ {0x8017, 224},
+ {0xc028, 224},
+ {0x8002, 226},
+ {0x8009, 226},
+ {0x8017, 226},
+ {0xc028, 226},
+ {0x8001, 153},
+ {0xc016, 153},
+ {0x8001, 161},
+ {0xc016, 161},
+ {0x8001, 167},
+ {0xc016, 167},
+ {0x8001, 172},
+ {0xc016, 172},
},
/* 106 */
{
- {3, 0x02, 224},
- {6, 0x02, 224},
- {10, 0x02, 224},
- {15, 0x02, 224},
- {24, 0x02, 224},
- {31, 0x02, 224},
- {41, 0x02, 224},
- {56, 0x03, 224},
- {3, 0x02, 226},
- {6, 0x02, 226},
- {10, 0x02, 226},
- {15, 0x02, 226},
- {24, 0x02, 226},
- {31, 0x02, 226},
- {41, 0x02, 226},
- {56, 0x03, 226},
+ {0x8003, 224},
+ {0x8006, 224},
+ {0x800a, 224},
+ {0x800f, 224},
+ {0x8018, 224},
+ {0x801f, 224},
+ {0x8029, 224},
+ {0xc038, 224},
+ {0x8003, 226},
+ {0x8006, 226},
+ {0x800a, 226},
+ {0x800f, 226},
+ {0x8018, 226},
+ {0x801f, 226},
+ {0x8029, 226},
+ {0xc038, 226},
},
/* 107 */
{
- {2, 0x02, 153},
- {9, 0x02, 153},
- {23, 0x02, 153},
- {40, 0x03, 153},
- {2, 0x02, 161},
- {9, 0x02, 161},
- {23, 0x02, 161},
- {40, 0x03, 161},
- {2, 0x02, 167},
- {9, 0x02, 167},
- {23, 0x02, 167},
- {40, 0x03, 167},
- {2, 0x02, 172},
- {9, 0x02, 172},
- {23, 0x02, 172},
- {40, 0x03, 172},
+ {0x8002, 153},
+ {0x8009, 153},
+ {0x8017, 153},
+ {0xc028, 153},
+ {0x8002, 161},
+ {0x8009, 161},
+ {0x8017, 161},
+ {0xc028, 161},
+ {0x8002, 167},
+ {0x8009, 167},
+ {0x8017, 167},
+ {0xc028, 167},
+ {0x8002, 172},
+ {0x8009, 172},
+ {0x8017, 172},
+ {0xc028, 172},
},
/* 108 */
{
- {3, 0x02, 153},
- {6, 0x02, 153},
- {10, 0x02, 153},
- {15, 0x02, 153},
- {24, 0x02, 153},
- {31, 0x02, 153},
- {41, 0x02, 153},
- {56, 0x03, 153},
- {3, 0x02, 161},
- {6, 0x02, 161},
- {10, 0x02, 161},
- {15, 0x02, 161},
- {24, 0x02, 161},
- {31, 0x02, 161},
- {41, 0x02, 161},
- {56, 0x03, 161},
+ {0x8003, 153},
+ {0x8006, 153},
+ {0x800a, 153},
+ {0x800f, 153},
+ {0x8018, 153},
+ {0x801f, 153},
+ {0x8029, 153},
+ {0xc038, 153},
+ {0x8003, 161},
+ {0x8006, 161},
+ {0x800a, 161},
+ {0x800f, 161},
+ {0x8018, 161},
+ {0x801f, 161},
+ {0x8029, 161},
+ {0xc038, 161},
},
/* 109 */
{
- {3, 0x02, 167},
- {6, 0x02, 167},
- {10, 0x02, 167},
- {15, 0x02, 167},
- {24, 0x02, 167},
- {31, 0x02, 167},
- {41, 0x02, 167},
- {56, 0x03, 167},
- {3, 0x02, 172},
- {6, 0x02, 172},
- {10, 0x02, 172},
- {15, 0x02, 172},
- {24, 0x02, 172},
- {31, 0x02, 172},
- {41, 0x02, 172},
- {56, 0x03, 172},
+ {0x8003, 167},
+ {0x8006, 167},
+ {0x800a, 167},
+ {0x800f, 167},
+ {0x8018, 167},
+ {0x801f, 167},
+ {0x8029, 167},
+ {0xc038, 167},
+ {0x8003, 172},
+ {0x8006, 172},
+ {0x800a, 172},
+ {0x800f, 172},
+ {0x8018, 172},
+ {0x801f, 172},
+ {0x8029, 172},
+ {0xc038, 172},
},
/* 110 */
{
- {114, 0x00, 0},
- {115, 0x00, 0},
- {117, 0x00, 0},
- {118, 0x00, 0},
- {121, 0x00, 0},
- {123, 0x00, 0},
- {127, 0x00, 0},
- {130, 0x00, 0},
- {136, 0x00, 0},
- {139, 0x00, 0},
- {143, 0x00, 0},
- {146, 0x00, 0},
- {155, 0x00, 0},
- {162, 0x00, 0},
- {170, 0x00, 0},
- {180, 0x00, 0},
+ {0x72, 0},
+ {0x73, 0},
+ {0x75, 0},
+ {0x76, 0},
+ {0x79, 0},
+ {0x7b, 0},
+ {0x7f, 0},
+ {0x82, 0},
+ {0x88, 0},
+ {0x8b, 0},
+ {0x8f, 0},
+ {0x92, 0},
+ {0x9b, 0},
+ {0xa2, 0},
+ {0xaa, 0},
+ {0xb4, 0},
},
/* 111 */
{
- {0, 0x03, 176},
- {0, 0x03, 177},
- {0, 0x03, 179},
- {0, 0x03, 209},
- {0, 0x03, 216},
- {0, 0x03, 217},
- {0, 0x03, 227},
- {0, 0x03, 229},
- {0, 0x03, 230},
- {122, 0x00, 0},
- {124, 0x00, 0},
- {125, 0x00, 0},
- {128, 0x00, 0},
- {129, 0x00, 0},
- {131, 0x00, 0},
- {132, 0x00, 0},
+ {0xc000, 176},
+ {0xc000, 177},
+ {0xc000, 179},
+ {0xc000, 209},
+ {0xc000, 216},
+ {0xc000, 217},
+ {0xc000, 227},
+ {0xc000, 229},
+ {0xc000, 230},
+ {0x7a, 0},
+ {0x7c, 0},
+ {0x7d, 0},
+ {0x80, 0},
+ {0x81, 0},
+ {0x83, 0},
+ {0x84, 0},
},
/* 112 */
{
- {1, 0x02, 176},
- {22, 0x03, 176},
- {1, 0x02, 177},
- {22, 0x03, 177},
- {1, 0x02, 179},
- {22, 0x03, 179},
- {1, 0x02, 209},
- {22, 0x03, 209},
- {1, 0x02, 216},
- {22, 0x03, 216},
- {1, 0x02, 217},
- {22, 0x03, 217},
- {1, 0x02, 227},
- {22, 0x03, 227},
- {1, 0x02, 229},
- {22, 0x03, 229},
+ {0x8001, 176},
+ {0xc016, 176},
+ {0x8001, 177},
+ {0xc016, 177},
+ {0x8001, 179},
+ {0xc016, 179},
+ {0x8001, 209},
+ {0xc016, 209},
+ {0x8001, 216},
+ {0xc016, 216},
+ {0x8001, 217},
+ {0xc016, 217},
+ {0x8001, 227},
+ {0xc016, 227},
+ {0x8001, 229},
+ {0xc016, 229},
},
/* 113 */
{
- {2, 0x02, 176},
- {9, 0x02, 176},
- {23, 0x02, 176},
- {40, 0x03, 176},
- {2, 0x02, 177},
- {9, 0x02, 177},
- {23, 0x02, 177},
- {40, 0x03, 177},
- {2, 0x02, 179},
- {9, 0x02, 179},
- {23, 0x02, 179},
- {40, 0x03, 179},
- {2, 0x02, 209},
- {9, 0x02, 209},
- {23, 0x02, 209},
- {40, 0x03, 209},
+ {0x8002, 176},
+ {0x8009, 176},
+ {0x8017, 176},
+ {0xc028, 176},
+ {0x8002, 177},
+ {0x8009, 177},
+ {0x8017, 177},
+ {0xc028, 177},
+ {0x8002, 179},
+ {0x8009, 179},
+ {0x8017, 179},
+ {0xc028, 179},
+ {0x8002, 209},
+ {0x8009, 209},
+ {0x8017, 209},
+ {0xc028, 209},
},
/* 114 */
{
- {3, 0x02, 176},
- {6, 0x02, 176},
- {10, 0x02, 176},
- {15, 0x02, 176},
- {24, 0x02, 176},
- {31, 0x02, 176},
- {41, 0x02, 176},
- {56, 0x03, 176},
- {3, 0x02, 177},
- {6, 0x02, 177},
- {10, 0x02, 177},
- {15, 0x02, 177},
- {24, 0x02, 177},
- {31, 0x02, 177},
- {41, 0x02, 177},
- {56, 0x03, 177},
+ {0x8003, 176},
+ {0x8006, 176},
+ {0x800a, 176},
+ {0x800f, 176},
+ {0x8018, 176},
+ {0x801f, 176},
+ {0x8029, 176},
+ {0xc038, 176},
+ {0x8003, 177},
+ {0x8006, 177},
+ {0x800a, 177},
+ {0x800f, 177},
+ {0x8018, 177},
+ {0x801f, 177},
+ {0x8029, 177},
+ {0xc038, 177},
},
/* 115 */
{
- {3, 0x02, 179},
- {6, 0x02, 179},
- {10, 0x02, 179},
- {15, 0x02, 179},
- {24, 0x02, 179},
- {31, 0x02, 179},
- {41, 0x02, 179},
- {56, 0x03, 179},
- {3, 0x02, 209},
- {6, 0x02, 209},
- {10, 0x02, 209},
- {15, 0x02, 209},
- {24, 0x02, 209},
- {31, 0x02, 209},
- {41, 0x02, 209},
- {56, 0x03, 209},
+ {0x8003, 179},
+ {0x8006, 179},
+ {0x800a, 179},
+ {0x800f, 179},
+ {0x8018, 179},
+ {0x801f, 179},
+ {0x8029, 179},
+ {0xc038, 179},
+ {0x8003, 209},
+ {0x8006, 209},
+ {0x800a, 209},
+ {0x800f, 209},
+ {0x8018, 209},
+ {0x801f, 209},
+ {0x8029, 209},
+ {0xc038, 209},
},
/* 116 */
{
- {2, 0x02, 216},
- {9, 0x02, 216},
- {23, 0x02, 216},
- {40, 0x03, 216},
- {2, 0x02, 217},
- {9, 0x02, 217},
- {23, 0x02, 217},
- {40, 0x03, 217},
- {2, 0x02, 227},
- {9, 0x02, 227},
- {23, 0x02, 227},
- {40, 0x03, 227},
- {2, 0x02, 229},
- {9, 0x02, 229},
- {23, 0x02, 229},
- {40, 0x03, 229},
+ {0x8002, 216},
+ {0x8009, 216},
+ {0x8017, 216},
+ {0xc028, 216},
+ {0x8002, 217},
+ {0x8009, 217},
+ {0x8017, 217},
+ {0xc028, 217},
+ {0x8002, 227},
+ {0x8009, 227},
+ {0x8017, 227},
+ {0xc028, 227},
+ {0x8002, 229},
+ {0x8009, 229},
+ {0x8017, 229},
+ {0xc028, 229},
},
/* 117 */
{
- {3, 0x02, 216},
- {6, 0x02, 216},
- {10, 0x02, 216},
- {15, 0x02, 216},
- {24, 0x02, 216},
- {31, 0x02, 216},
- {41, 0x02, 216},
- {56, 0x03, 216},
- {3, 0x02, 217},
- {6, 0x02, 217},
- {10, 0x02, 217},
- {15, 0x02, 217},
- {24, 0x02, 217},
- {31, 0x02, 217},
- {41, 0x02, 217},
- {56, 0x03, 217},
+ {0x8003, 216},
+ {0x8006, 216},
+ {0x800a, 216},
+ {0x800f, 216},
+ {0x8018, 216},
+ {0x801f, 216},
+ {0x8029, 216},
+ {0xc038, 216},
+ {0x8003, 217},
+ {0x8006, 217},
+ {0x800a, 217},
+ {0x800f, 217},
+ {0x8018, 217},
+ {0x801f, 217},
+ {0x8029, 217},
+ {0xc038, 217},
},
/* 118 */
{
- {3, 0x02, 227},
- {6, 0x02, 227},
- {10, 0x02, 227},
- {15, 0x02, 227},
- {24, 0x02, 227},
- {31, 0x02, 227},
- {41, 0x02, 227},
- {56, 0x03, 227},
- {3, 0x02, 229},
- {6, 0x02, 229},
- {10, 0x02, 229},
- {15, 0x02, 229},
- {24, 0x02, 229},
- {31, 0x02, 229},
- {41, 0x02, 229},
- {56, 0x03, 229},
+ {0x8003, 227},
+ {0x8006, 227},
+ {0x800a, 227},
+ {0x800f, 227},
+ {0x8018, 227},
+ {0x801f, 227},
+ {0x8029, 227},
+ {0xc038, 227},
+ {0x8003, 229},
+ {0x8006, 229},
+ {0x800a, 229},
+ {0x800f, 229},
+ {0x8018, 229},
+ {0x801f, 229},
+ {0x8029, 229},
+ {0xc038, 229},
},
/* 119 */
{
- {1, 0x02, 230},
- {22, 0x03, 230},
- {0, 0x03, 129},
- {0, 0x03, 132},
- {0, 0x03, 133},
- {0, 0x03, 134},
- {0, 0x03, 136},
- {0, 0x03, 146},
- {0, 0x03, 154},
- {0, 0x03, 156},
- {0, 0x03, 160},
- {0, 0x03, 163},
- {0, 0x03, 164},
- {0, 0x03, 169},
- {0, 0x03, 170},
- {0, 0x03, 173},
+ {0x8001, 230},
+ {0xc016, 230},
+ {0xc000, 129},
+ {0xc000, 132},
+ {0xc000, 133},
+ {0xc000, 134},
+ {0xc000, 136},
+ {0xc000, 146},
+ {0xc000, 154},
+ {0xc000, 156},
+ {0xc000, 160},
+ {0xc000, 163},
+ {0xc000, 164},
+ {0xc000, 169},
+ {0xc000, 170},
+ {0xc000, 173},
},
/* 120 */
{
- {2, 0x02, 230},
- {9, 0x02, 230},
- {23, 0x02, 230},
- {40, 0x03, 230},
- {1, 0x02, 129},
- {22, 0x03, 129},
- {1, 0x02, 132},
- {22, 0x03, 132},
- {1, 0x02, 133},
- {22, 0x03, 133},
- {1, 0x02, 134},
- {22, 0x03, 134},
- {1, 0x02, 136},
- {22, 0x03, 136},
- {1, 0x02, 146},
- {22, 0x03, 146},
+ {0x8002, 230},
+ {0x8009, 230},
+ {0x8017, 230},
+ {0xc028, 230},
+ {0x8001, 129},
+ {0xc016, 129},
+ {0x8001, 132},
+ {0xc016, 132},
+ {0x8001, 133},
+ {0xc016, 133},
+ {0x8001, 134},
+ {0xc016, 134},
+ {0x8001, 136},
+ {0xc016, 136},
+ {0x8001, 146},
+ {0xc016, 146},
},
/* 121 */
{
- {3, 0x02, 230},
- {6, 0x02, 230},
- {10, 0x02, 230},
- {15, 0x02, 230},
- {24, 0x02, 230},
- {31, 0x02, 230},
- {41, 0x02, 230},
- {56, 0x03, 230},
- {2, 0x02, 129},
- {9, 0x02, 129},
- {23, 0x02, 129},
- {40, 0x03, 129},
- {2, 0x02, 132},
- {9, 0x02, 132},
- {23, 0x02, 132},
- {40, 0x03, 132},
+ {0x8003, 230},
+ {0x8006, 230},
+ {0x800a, 230},
+ {0x800f, 230},
+ {0x8018, 230},
+ {0x801f, 230},
+ {0x8029, 230},
+ {0xc038, 230},
+ {0x8002, 129},
+ {0x8009, 129},
+ {0x8017, 129},
+ {0xc028, 129},
+ {0x8002, 132},
+ {0x8009, 132},
+ {0x8017, 132},
+ {0xc028, 132},
},
/* 122 */
{
- {3, 0x02, 129},
- {6, 0x02, 129},
- {10, 0x02, 129},
- {15, 0x02, 129},
- {24, 0x02, 129},
- {31, 0x02, 129},
- {41, 0x02, 129},
- {56, 0x03, 129},
- {3, 0x02, 132},
- {6, 0x02, 132},
- {10, 0x02, 132},
- {15, 0x02, 132},
- {24, 0x02, 132},
- {31, 0x02, 132},
- {41, 0x02, 132},
- {56, 0x03, 132},
+ {0x8003, 129},
+ {0x8006, 129},
+ {0x800a, 129},
+ {0x800f, 129},
+ {0x8018, 129},
+ {0x801f, 129},
+ {0x8029, 129},
+ {0xc038, 129},
+ {0x8003, 132},
+ {0x8006, 132},
+ {0x800a, 132},
+ {0x800f, 132},
+ {0x8018, 132},
+ {0x801f, 132},
+ {0x8029, 132},
+ {0xc038, 132},
},
/* 123 */
{
- {2, 0x02, 133},
- {9, 0x02, 133},
- {23, 0x02, 133},
- {40, 0x03, 133},
- {2, 0x02, 134},
- {9, 0x02, 134},
- {23, 0x02, 134},
- {40, 0x03, 134},
- {2, 0x02, 136},
- {9, 0x02, 136},
- {23, 0x02, 136},
- {40, 0x03, 136},
- {2, 0x02, 146},
- {9, 0x02, 146},
- {23, 0x02, 146},
- {40, 0x03, 146},
+ {0x8002, 133},
+ {0x8009, 133},
+ {0x8017, 133},
+ {0xc028, 133},
+ {0x8002, 134},
+ {0x8009, 134},
+ {0x8017, 134},
+ {0xc028, 134},
+ {0x8002, 136},
+ {0x8009, 136},
+ {0x8017, 136},
+ {0xc028, 136},
+ {0x8002, 146},
+ {0x8009, 146},
+ {0x8017, 146},
+ {0xc028, 146},
},
/* 124 */
{
- {3, 0x02, 133},
- {6, 0x02, 133},
- {10, 0x02, 133},
- {15, 0x02, 133},
- {24, 0x02, 133},
- {31, 0x02, 133},
- {41, 0x02, 133},
- {56, 0x03, 133},
- {3, 0x02, 134},
- {6, 0x02, 134},
- {10, 0x02, 134},
- {15, 0x02, 134},
- {24, 0x02, 134},
- {31, 0x02, 134},
- {41, 0x02, 134},
- {56, 0x03, 134},
+ {0x8003, 133},
+ {0x8006, 133},
+ {0x800a, 133},
+ {0x800f, 133},
+ {0x8018, 133},
+ {0x801f, 133},
+ {0x8029, 133},
+ {0xc038, 133},
+ {0x8003, 134},
+ {0x8006, 134},
+ {0x800a, 134},
+ {0x800f, 134},
+ {0x8018, 134},
+ {0x801f, 134},
+ {0x8029, 134},
+ {0xc038, 134},
},
/* 125 */
{
- {3, 0x02, 136},
- {6, 0x02, 136},
- {10, 0x02, 136},
- {15, 0x02, 136},
- {24, 0x02, 136},
- {31, 0x02, 136},
- {41, 0x02, 136},
- {56, 0x03, 136},
- {3, 0x02, 146},
- {6, 0x02, 146},
- {10, 0x02, 146},
- {15, 0x02, 146},
- {24, 0x02, 146},
- {31, 0x02, 146},
- {41, 0x02, 146},
- {56, 0x03, 146},
+ {0x8003, 136},
+ {0x8006, 136},
+ {0x800a, 136},
+ {0x800f, 136},
+ {0x8018, 136},
+ {0x801f, 136},
+ {0x8029, 136},
+ {0xc038, 136},
+ {0x8003, 146},
+ {0x8006, 146},
+ {0x800a, 146},
+ {0x800f, 146},
+ {0x8018, 146},
+ {0x801f, 146},
+ {0x8029, 146},
+ {0xc038, 146},
},
/* 126 */
{
- {1, 0x02, 154},
- {22, 0x03, 154},
- {1, 0x02, 156},
- {22, 0x03, 156},
- {1, 0x02, 160},
- {22, 0x03, 160},
- {1, 0x02, 163},
- {22, 0x03, 163},
- {1, 0x02, 164},
- {22, 0x03, 164},
- {1, 0x02, 169},
- {22, 0x03, 169},
- {1, 0x02, 170},
- {22, 0x03, 170},
- {1, 0x02, 173},
- {22, 0x03, 173},
+ {0x8001, 154},
+ {0xc016, 154},
+ {0x8001, 156},
+ {0xc016, 156},
+ {0x8001, 160},
+ {0xc016, 160},
+ {0x8001, 163},
+ {0xc016, 163},
+ {0x8001, 164},
+ {0xc016, 164},
+ {0x8001, 169},
+ {0xc016, 169},
+ {0x8001, 170},
+ {0xc016, 170},
+ {0x8001, 173},
+ {0xc016, 173},
},
/* 127 */
{
- {2, 0x02, 154},
- {9, 0x02, 154},
- {23, 0x02, 154},
- {40, 0x03, 154},
- {2, 0x02, 156},
- {9, 0x02, 156},
- {23, 0x02, 156},
- {40, 0x03, 156},
- {2, 0x02, 160},
- {9, 0x02, 160},
- {23, 0x02, 160},
- {40, 0x03, 160},
- {2, 0x02, 163},
- {9, 0x02, 163},
- {23, 0x02, 163},
- {40, 0x03, 163},
+ {0x8002, 154},
+ {0x8009, 154},
+ {0x8017, 154},
+ {0xc028, 154},
+ {0x8002, 156},
+ {0x8009, 156},
+ {0x8017, 156},
+ {0xc028, 156},
+ {0x8002, 160},
+ {0x8009, 160},
+ {0x8017, 160},
+ {0xc028, 160},
+ {0x8002, 163},
+ {0x8009, 163},
+ {0x8017, 163},
+ {0xc028, 163},
},
/* 128 */
{
- {3, 0x02, 154},
- {6, 0x02, 154},
- {10, 0x02, 154},
- {15, 0x02, 154},
- {24, 0x02, 154},
- {31, 0x02, 154},
- {41, 0x02, 154},
- {56, 0x03, 154},
- {3, 0x02, 156},
- {6, 0x02, 156},
- {10, 0x02, 156},
- {15, 0x02, 156},
- {24, 0x02, 156},
- {31, 0x02, 156},
- {41, 0x02, 156},
- {56, 0x03, 156},
+ {0x8003, 154},
+ {0x8006, 154},
+ {0x800a, 154},
+ {0x800f, 154},
+ {0x8018, 154},
+ {0x801f, 154},
+ {0x8029, 154},
+ {0xc038, 154},
+ {0x8003, 156},
+ {0x8006, 156},
+ {0x800a, 156},
+ {0x800f, 156},
+ {0x8018, 156},
+ {0x801f, 156},
+ {0x8029, 156},
+ {0xc038, 156},
},
/* 129 */
{
- {3, 0x02, 160},
- {6, 0x02, 160},
- {10, 0x02, 160},
- {15, 0x02, 160},
- {24, 0x02, 160},
- {31, 0x02, 160},
- {41, 0x02, 160},
- {56, 0x03, 160},
- {3, 0x02, 163},
- {6, 0x02, 163},
- {10, 0x02, 163},
- {15, 0x02, 163},
- {24, 0x02, 163},
- {31, 0x02, 163},
- {41, 0x02, 163},
- {56, 0x03, 163},
+ {0x8003, 160},
+ {0x8006, 160},
+ {0x800a, 160},
+ {0x800f, 160},
+ {0x8018, 160},
+ {0x801f, 160},
+ {0x8029, 160},
+ {0xc038, 160},
+ {0x8003, 163},
+ {0x8006, 163},
+ {0x800a, 163},
+ {0x800f, 163},
+ {0x8018, 163},
+ {0x801f, 163},
+ {0x8029, 163},
+ {0xc038, 163},
},
/* 130 */
{
- {2, 0x02, 164},
- {9, 0x02, 164},
- {23, 0x02, 164},
- {40, 0x03, 164},
- {2, 0x02, 169},
- {9, 0x02, 169},
- {23, 0x02, 169},
- {40, 0x03, 169},
- {2, 0x02, 170},
- {9, 0x02, 170},
- {23, 0x02, 170},
- {40, 0x03, 170},
- {2, 0x02, 173},
- {9, 0x02, 173},
- {23, 0x02, 173},
- {40, 0x03, 173},
+ {0x8002, 164},
+ {0x8009, 164},
+ {0x8017, 164},
+ {0xc028, 164},
+ {0x8002, 169},
+ {0x8009, 169},
+ {0x8017, 169},
+ {0xc028, 169},
+ {0x8002, 170},
+ {0x8009, 170},
+ {0x8017, 170},
+ {0xc028, 170},
+ {0x8002, 173},
+ {0x8009, 173},
+ {0x8017, 173},
+ {0xc028, 173},
},
/* 131 */
{
- {3, 0x02, 164},
- {6, 0x02, 164},
- {10, 0x02, 164},
- {15, 0x02, 164},
- {24, 0x02, 164},
- {31, 0x02, 164},
- {41, 0x02, 164},
- {56, 0x03, 164},
- {3, 0x02, 169},
- {6, 0x02, 169},
- {10, 0x02, 169},
- {15, 0x02, 169},
- {24, 0x02, 169},
- {31, 0x02, 169},
- {41, 0x02, 169},
- {56, 0x03, 169},
+ {0x8003, 164},
+ {0x8006, 164},
+ {0x800a, 164},
+ {0x800f, 164},
+ {0x8018, 164},
+ {0x801f, 164},
+ {0x8029, 164},
+ {0xc038, 164},
+ {0x8003, 169},
+ {0x8006, 169},
+ {0x800a, 169},
+ {0x800f, 169},
+ {0x8018, 169},
+ {0x801f, 169},
+ {0x8029, 169},
+ {0xc038, 169},
},
/* 132 */
{
- {3, 0x02, 170},
- {6, 0x02, 170},
- {10, 0x02, 170},
- {15, 0x02, 170},
- {24, 0x02, 170},
- {31, 0x02, 170},
- {41, 0x02, 170},
- {56, 0x03, 170},
- {3, 0x02, 173},
- {6, 0x02, 173},
- {10, 0x02, 173},
- {15, 0x02, 173},
- {24, 0x02, 173},
- {31, 0x02, 173},
- {41, 0x02, 173},
- {56, 0x03, 173},
+ {0x8003, 170},
+ {0x8006, 170},
+ {0x800a, 170},
+ {0x800f, 170},
+ {0x8018, 170},
+ {0x801f, 170},
+ {0x8029, 170},
+ {0xc038, 170},
+ {0x8003, 173},
+ {0x8006, 173},
+ {0x800a, 173},
+ {0x800f, 173},
+ {0x8018, 173},
+ {0x801f, 173},
+ {0x8029, 173},
+ {0xc038, 173},
},
/* 133 */
{
- {137, 0x00, 0},
- {138, 0x00, 0},
- {140, 0x00, 0},
- {141, 0x00, 0},
- {144, 0x00, 0},
- {145, 0x00, 0},
- {147, 0x00, 0},
- {150, 0x00, 0},
- {156, 0x00, 0},
- {159, 0x00, 0},
- {163, 0x00, 0},
- {166, 0x00, 0},
- {171, 0x00, 0},
- {174, 0x00, 0},
- {181, 0x00, 0},
- {190, 0x00, 0},
+ {0x89, 0},
+ {0x8a, 0},
+ {0x8c, 0},
+ {0x8d, 0},
+ {0x90, 0},
+ {0x91, 0},
+ {0x93, 0},
+ {0x96, 0},
+ {0x9c, 0},
+ {0x9f, 0},
+ {0xa3, 0},
+ {0xa6, 0},
+ {0xab, 0},
+ {0xae, 0},
+ {0xb5, 0},
+ {0xbe, 0},
},
/* 134 */
{
- {0, 0x03, 178},
- {0, 0x03, 181},
- {0, 0x03, 185},
- {0, 0x03, 186},
- {0, 0x03, 187},
- {0, 0x03, 189},
- {0, 0x03, 190},
- {0, 0x03, 196},
- {0, 0x03, 198},
- {0, 0x03, 228},
- {0, 0x03, 232},
- {0, 0x03, 233},
- {148, 0x00, 0},
- {149, 0x00, 0},
- {151, 0x00, 0},
- {152, 0x00, 0},
+ {0xc000, 178},
+ {0xc000, 181},
+ {0xc000, 185},
+ {0xc000, 186},
+ {0xc000, 187},
+ {0xc000, 189},
+ {0xc000, 190},
+ {0xc000, 196},
+ {0xc000, 198},
+ {0xc000, 228},
+ {0xc000, 232},
+ {0xc000, 233},
+ {0x94, 0},
+ {0x95, 0},
+ {0x97, 0},
+ {0x98, 0},
},
/* 135 */
{
- {1, 0x02, 178},
- {22, 0x03, 178},
- {1, 0x02, 181},
- {22, 0x03, 181},
- {1, 0x02, 185},
- {22, 0x03, 185},
- {1, 0x02, 186},
- {22, 0x03, 186},
- {1, 0x02, 187},
- {22, 0x03, 187},
- {1, 0x02, 189},
- {22, 0x03, 189},
- {1, 0x02, 190},
- {22, 0x03, 190},
- {1, 0x02, 196},
- {22, 0x03, 196},
+ {0x8001, 178},
+ {0xc016, 178},
+ {0x8001, 181},
+ {0xc016, 181},
+ {0x8001, 185},
+ {0xc016, 185},
+ {0x8001, 186},
+ {0xc016, 186},
+ {0x8001, 187},
+ {0xc016, 187},
+ {0x8001, 189},
+ {0xc016, 189},
+ {0x8001, 190},
+ {0xc016, 190},
+ {0x8001, 196},
+ {0xc016, 196},
},
/* 136 */
{
- {2, 0x02, 178},
- {9, 0x02, 178},
- {23, 0x02, 178},
- {40, 0x03, 178},
- {2, 0x02, 181},
- {9, 0x02, 181},
- {23, 0x02, 181},
- {40, 0x03, 181},
- {2, 0x02, 185},
- {9, 0x02, 185},
- {23, 0x02, 185},
- {40, 0x03, 185},
- {2, 0x02, 186},
- {9, 0x02, 186},
- {23, 0x02, 186},
- {40, 0x03, 186},
+ {0x8002, 178},
+ {0x8009, 178},
+ {0x8017, 178},
+ {0xc028, 178},
+ {0x8002, 181},
+ {0x8009, 181},
+ {0x8017, 181},
+ {0xc028, 181},
+ {0x8002, 185},
+ {0x8009, 185},
+ {0x8017, 185},
+ {0xc028, 185},
+ {0x8002, 186},
+ {0x8009, 186},
+ {0x8017, 186},
+ {0xc028, 186},
},
/* 137 */
{
- {3, 0x02, 178},
- {6, 0x02, 178},
- {10, 0x02, 178},
- {15, 0x02, 178},
- {24, 0x02, 178},
- {31, 0x02, 178},
- {41, 0x02, 178},
- {56, 0x03, 178},
- {3, 0x02, 181},
- {6, 0x02, 181},
- {10, 0x02, 181},
- {15, 0x02, 181},
- {24, 0x02, 181},
- {31, 0x02, 181},
- {41, 0x02, 181},
- {56, 0x03, 181},
+ {0x8003, 178},
+ {0x8006, 178},
+ {0x800a, 178},
+ {0x800f, 178},
+ {0x8018, 178},
+ {0x801f, 178},
+ {0x8029, 178},
+ {0xc038, 178},
+ {0x8003, 181},
+ {0x8006, 181},
+ {0x800a, 181},
+ {0x800f, 181},
+ {0x8018, 181},
+ {0x801f, 181},
+ {0x8029, 181},
+ {0xc038, 181},
},
/* 138 */
{
- {3, 0x02, 185},
- {6, 0x02, 185},
- {10, 0x02, 185},
- {15, 0x02, 185},
- {24, 0x02, 185},
- {31, 0x02, 185},
- {41, 0x02, 185},
- {56, 0x03, 185},
- {3, 0x02, 186},
- {6, 0x02, 186},
- {10, 0x02, 186},
- {15, 0x02, 186},
- {24, 0x02, 186},
- {31, 0x02, 186},
- {41, 0x02, 186},
- {56, 0x03, 186},
+ {0x8003, 185},
+ {0x8006, 185},
+ {0x800a, 185},
+ {0x800f, 185},
+ {0x8018, 185},
+ {0x801f, 185},
+ {0x8029, 185},
+ {0xc038, 185},
+ {0x8003, 186},
+ {0x8006, 186},
+ {0x800a, 186},
+ {0x800f, 186},
+ {0x8018, 186},
+ {0x801f, 186},
+ {0x8029, 186},
+ {0xc038, 186},
},
/* 139 */
{
- {2, 0x02, 187},
- {9, 0x02, 187},
- {23, 0x02, 187},
- {40, 0x03, 187},
- {2, 0x02, 189},
- {9, 0x02, 189},
- {23, 0x02, 189},
- {40, 0x03, 189},
- {2, 0x02, 190},
- {9, 0x02, 190},
- {23, 0x02, 190},
- {40, 0x03, 190},
- {2, 0x02, 196},
- {9, 0x02, 196},
- {23, 0x02, 196},
- {40, 0x03, 196},
+ {0x8002, 187},
+ {0x8009, 187},
+ {0x8017, 187},
+ {0xc028, 187},
+ {0x8002, 189},
+ {0x8009, 189},
+ {0x8017, 189},
+ {0xc028, 189},
+ {0x8002, 190},
+ {0x8009, 190},
+ {0x8017, 190},
+ {0xc028, 190},
+ {0x8002, 196},
+ {0x8009, 196},
+ {0x8017, 196},
+ {0xc028, 196},
},
/* 140 */
{
- {3, 0x02, 187},
- {6, 0x02, 187},
- {10, 0x02, 187},
- {15, 0x02, 187},
- {24, 0x02, 187},
- {31, 0x02, 187},
- {41, 0x02, 187},
- {56, 0x03, 187},
- {3, 0x02, 189},
- {6, 0x02, 189},
- {10, 0x02, 189},
- {15, 0x02, 189},
- {24, 0x02, 189},
- {31, 0x02, 189},
- {41, 0x02, 189},
- {56, 0x03, 189},
+ {0x8003, 187},
+ {0x8006, 187},
+ {0x800a, 187},
+ {0x800f, 187},
+ {0x8018, 187},
+ {0x801f, 187},
+ {0x8029, 187},
+ {0xc038, 187},
+ {0x8003, 189},
+ {0x8006, 189},
+ {0x800a, 189},
+ {0x800f, 189},
+ {0x8018, 189},
+ {0x801f, 189},
+ {0x8029, 189},
+ {0xc038, 189},
},
/* 141 */
{
- {3, 0x02, 190},
- {6, 0x02, 190},
- {10, 0x02, 190},
- {15, 0x02, 190},
- {24, 0x02, 190},
- {31, 0x02, 190},
- {41, 0x02, 190},
- {56, 0x03, 190},
- {3, 0x02, 196},
- {6, 0x02, 196},
- {10, 0x02, 196},
- {15, 0x02, 196},
- {24, 0x02, 196},
- {31, 0x02, 196},
- {41, 0x02, 196},
- {56, 0x03, 196},
+ {0x8003, 190},
+ {0x8006, 190},
+ {0x800a, 190},
+ {0x800f, 190},
+ {0x8018, 190},
+ {0x801f, 190},
+ {0x8029, 190},
+ {0xc038, 190},
+ {0x8003, 196},
+ {0x8006, 196},
+ {0x800a, 196},
+ {0x800f, 196},
+ {0x8018, 196},
+ {0x801f, 196},
+ {0x8029, 196},
+ {0xc038, 196},
},
/* 142 */
{
- {1, 0x02, 198},
- {22, 0x03, 198},
- {1, 0x02, 228},
- {22, 0x03, 228},
- {1, 0x02, 232},
- {22, 0x03, 232},
- {1, 0x02, 233},
- {22, 0x03, 233},
- {0, 0x03, 1},
- {0, 0x03, 135},
- {0, 0x03, 137},
- {0, 0x03, 138},
- {0, 0x03, 139},
- {0, 0x03, 140},
- {0, 0x03, 141},
- {0, 0x03, 143},
+ {0x8001, 198},
+ {0xc016, 198},
+ {0x8001, 228},
+ {0xc016, 228},
+ {0x8001, 232},
+ {0xc016, 232},
+ {0x8001, 233},
+ {0xc016, 233},
+ {0xc000, 1},
+ {0xc000, 135},
+ {0xc000, 137},
+ {0xc000, 138},
+ {0xc000, 139},
+ {0xc000, 140},
+ {0xc000, 141},
+ {0xc000, 143},
},
/* 143 */
{
- {2, 0x02, 198},
- {9, 0x02, 198},
- {23, 0x02, 198},
- {40, 0x03, 198},
- {2, 0x02, 228},
- {9, 0x02, 228},
- {23, 0x02, 228},
- {40, 0x03, 228},
- {2, 0x02, 232},
- {9, 0x02, 232},
- {23, 0x02, 232},
- {40, 0x03, 232},
- {2, 0x02, 233},
- {9, 0x02, 233},
- {23, 0x02, 233},
- {40, 0x03, 233},
+ {0x8002, 198},
+ {0x8009, 198},
+ {0x8017, 198},
+ {0xc028, 198},
+ {0x8002, 228},
+ {0x8009, 228},
+ {0x8017, 228},
+ {0xc028, 228},
+ {0x8002, 232},
+ {0x8009, 232},
+ {0x8017, 232},
+ {0xc028, 232},
+ {0x8002, 233},
+ {0x8009, 233},
+ {0x8017, 233},
+ {0xc028, 233},
},
/* 144 */
{
- {3, 0x02, 198},
- {6, 0x02, 198},
- {10, 0x02, 198},
- {15, 0x02, 198},
- {24, 0x02, 198},
- {31, 0x02, 198},
- {41, 0x02, 198},
- {56, 0x03, 198},
- {3, 0x02, 228},
- {6, 0x02, 228},
- {10, 0x02, 228},
- {15, 0x02, 228},
- {24, 0x02, 228},
- {31, 0x02, 228},
- {41, 0x02, 228},
- {56, 0x03, 228},
+ {0x8003, 198},
+ {0x8006, 198},
+ {0x800a, 198},
+ {0x800f, 198},
+ {0x8018, 198},
+ {0x801f, 198},
+ {0x8029, 198},
+ {0xc038, 198},
+ {0x8003, 228},
+ {0x8006, 228},
+ {0x800a, 228},
+ {0x800f, 228},
+ {0x8018, 228},
+ {0x801f, 228},
+ {0x8029, 228},
+ {0xc038, 228},
},
/* 145 */
{
- {3, 0x02, 232},
- {6, 0x02, 232},
- {10, 0x02, 232},
- {15, 0x02, 232},
- {24, 0x02, 232},
- {31, 0x02, 232},
- {41, 0x02, 232},
- {56, 0x03, 232},
- {3, 0x02, 233},
- {6, 0x02, 233},
- {10, 0x02, 233},
- {15, 0x02, 233},
- {24, 0x02, 233},
- {31, 0x02, 233},
- {41, 0x02, 233},
- {56, 0x03, 233},
+ {0x8003, 232},
+ {0x8006, 232},
+ {0x800a, 232},
+ {0x800f, 232},
+ {0x8018, 232},
+ {0x801f, 232},
+ {0x8029, 232},
+ {0xc038, 232},
+ {0x8003, 233},
+ {0x8006, 233},
+ {0x800a, 233},
+ {0x800f, 233},
+ {0x8018, 233},
+ {0x801f, 233},
+ {0x8029, 233},
+ {0xc038, 233},
},
/* 146 */
{
- {1, 0x02, 1},
- {22, 0x03, 1},
- {1, 0x02, 135},
- {22, 0x03, 135},
- {1, 0x02, 137},
- {22, 0x03, 137},
- {1, 0x02, 138},
- {22, 0x03, 138},
- {1, 0x02, 139},
- {22, 0x03, 139},
- {1, 0x02, 140},
- {22, 0x03, 140},
- {1, 0x02, 141},
- {22, 0x03, 141},
- {1, 0x02, 143},
- {22, 0x03, 143},
+ {0x8001, 1},
+ {0xc016, 1},
+ {0x8001, 135},
+ {0xc016, 135},
+ {0x8001, 137},
+ {0xc016, 137},
+ {0x8001, 138},
+ {0xc016, 138},
+ {0x8001, 139},
+ {0xc016, 139},
+ {0x8001, 140},
+ {0xc016, 140},
+ {0x8001, 141},
+ {0xc016, 141},
+ {0x8001, 143},
+ {0xc016, 143},
},
/* 147 */
{
- {2, 0x02, 1},
- {9, 0x02, 1},
- {23, 0x02, 1},
- {40, 0x03, 1},
- {2, 0x02, 135},
- {9, 0x02, 135},
- {23, 0x02, 135},
- {40, 0x03, 135},
- {2, 0x02, 137},
- {9, 0x02, 137},
- {23, 0x02, 137},
- {40, 0x03, 137},
- {2, 0x02, 138},
- {9, 0x02, 138},
- {23, 0x02, 138},
- {40, 0x03, 138},
+ {0x8002, 1},
+ {0x8009, 1},
+ {0x8017, 1},
+ {0xc028, 1},
+ {0x8002, 135},
+ {0x8009, 135},
+ {0x8017, 135},
+ {0xc028, 135},
+ {0x8002, 137},
+ {0x8009, 137},
+ {0x8017, 137},
+ {0xc028, 137},
+ {0x8002, 138},
+ {0x8009, 138},
+ {0x8017, 138},
+ {0xc028, 138},
},
/* 148 */
{
- {3, 0x02, 1},
- {6, 0x02, 1},
- {10, 0x02, 1},
- {15, 0x02, 1},
- {24, 0x02, 1},
- {31, 0x02, 1},
- {41, 0x02, 1},
- {56, 0x03, 1},
- {3, 0x02, 135},
- {6, 0x02, 135},
- {10, 0x02, 135},
- {15, 0x02, 135},
- {24, 0x02, 135},
- {31, 0x02, 135},
- {41, 0x02, 135},
- {56, 0x03, 135},
+ {0x8003, 1},
+ {0x8006, 1},
+ {0x800a, 1},
+ {0x800f, 1},
+ {0x8018, 1},
+ {0x801f, 1},
+ {0x8029, 1},
+ {0xc038, 1},
+ {0x8003, 135},
+ {0x8006, 135},
+ {0x800a, 135},
+ {0x800f, 135},
+ {0x8018, 135},
+ {0x801f, 135},
+ {0x8029, 135},
+ {0xc038, 135},
},
/* 149 */
{
- {3, 0x02, 137},
- {6, 0x02, 137},
- {10, 0x02, 137},
- {15, 0x02, 137},
- {24, 0x02, 137},
- {31, 0x02, 137},
- {41, 0x02, 137},
- {56, 0x03, 137},
- {3, 0x02, 138},
- {6, 0x02, 138},
- {10, 0x02, 138},
- {15, 0x02, 138},
- {24, 0x02, 138},
- {31, 0x02, 138},
- {41, 0x02, 138},
- {56, 0x03, 138},
+ {0x8003, 137},
+ {0x8006, 137},
+ {0x800a, 137},
+ {0x800f, 137},
+ {0x8018, 137},
+ {0x801f, 137},
+ {0x8029, 137},
+ {0xc038, 137},
+ {0x8003, 138},
+ {0x8006, 138},
+ {0x800a, 138},
+ {0x800f, 138},
+ {0x8018, 138},
+ {0x801f, 138},
+ {0x8029, 138},
+ {0xc038, 138},
},
/* 150 */
{
- {2, 0x02, 139},
- {9, 0x02, 139},
- {23, 0x02, 139},
- {40, 0x03, 139},
- {2, 0x02, 140},
- {9, 0x02, 140},
- {23, 0x02, 140},
- {40, 0x03, 140},
- {2, 0x02, 141},
- {9, 0x02, 141},
- {23, 0x02, 141},
- {40, 0x03, 141},
- {2, 0x02, 143},
- {9, 0x02, 143},
- {23, 0x02, 143},
- {40, 0x03, 143},
+ {0x8002, 139},
+ {0x8009, 139},
+ {0x8017, 139},
+ {0xc028, 139},
+ {0x8002, 140},
+ {0x8009, 140},
+ {0x8017, 140},
+ {0xc028, 140},
+ {0x8002, 141},
+ {0x8009, 141},
+ {0x8017, 141},
+ {0xc028, 141},
+ {0x8002, 143},
+ {0x8009, 143},
+ {0x8017, 143},
+ {0xc028, 143},
},
/* 151 */
{
- {3, 0x02, 139},
- {6, 0x02, 139},
- {10, 0x02, 139},
- {15, 0x02, 139},
- {24, 0x02, 139},
- {31, 0x02, 139},
- {41, 0x02, 139},
- {56, 0x03, 139},
- {3, 0x02, 140},
- {6, 0x02, 140},
- {10, 0x02, 140},
- {15, 0x02, 140},
- {24, 0x02, 140},
- {31, 0x02, 140},
- {41, 0x02, 140},
- {56, 0x03, 140},
+ {0x8003, 139},
+ {0x8006, 139},
+ {0x800a, 139},
+ {0x800f, 139},
+ {0x8018, 139},
+ {0x801f, 139},
+ {0x8029, 139},
+ {0xc038, 139},
+ {0x8003, 140},
+ {0x8006, 140},
+ {0x800a, 140},
+ {0x800f, 140},
+ {0x8018, 140},
+ {0x801f, 140},
+ {0x8029, 140},
+ {0xc038, 140},
},
/* 152 */
{
- {3, 0x02, 141},
- {6, 0x02, 141},
- {10, 0x02, 141},
- {15, 0x02, 141},
- {24, 0x02, 141},
- {31, 0x02, 141},
- {41, 0x02, 141},
- {56, 0x03, 141},
- {3, 0x02, 143},
- {6, 0x02, 143},
- {10, 0x02, 143},
- {15, 0x02, 143},
- {24, 0x02, 143},
- {31, 0x02, 143},
- {41, 0x02, 143},
- {56, 0x03, 143},
+ {0x8003, 141},
+ {0x8006, 141},
+ {0x800a, 141},
+ {0x800f, 141},
+ {0x8018, 141},
+ {0x801f, 141},
+ {0x8029, 141},
+ {0xc038, 141},
+ {0x8003, 143},
+ {0x8006, 143},
+ {0x800a, 143},
+ {0x800f, 143},
+ {0x8018, 143},
+ {0x801f, 143},
+ {0x8029, 143},
+ {0xc038, 143},
},
/* 153 */
{
- {157, 0x00, 0},
- {158, 0x00, 0},
- {160, 0x00, 0},
- {161, 0x00, 0},
- {164, 0x00, 0},
- {165, 0x00, 0},
- {167, 0x00, 0},
- {168, 0x00, 0},
- {172, 0x00, 0},
- {173, 0x00, 0},
- {175, 0x00, 0},
- {177, 0x00, 0},
- {182, 0x00, 0},
- {185, 0x00, 0},
- {191, 0x00, 0},
- {207, 0x00, 0},
+ {0x9d, 0},
+ {0x9e, 0},
+ {0xa0, 0},
+ {0xa1, 0},
+ {0xa4, 0},
+ {0xa5, 0},
+ {0xa7, 0},
+ {0xa8, 0},
+ {0xac, 0},
+ {0xad, 0},
+ {0xaf, 0},
+ {0xb1, 0},
+ {0xb6, 0},
+ {0xb9, 0},
+ {0xbf, 0},
+ {0xcf, 0},
},
/* 154 */
{
- {0, 0x03, 147},
- {0, 0x03, 149},
- {0, 0x03, 150},
- {0, 0x03, 151},
- {0, 0x03, 152},
- {0, 0x03, 155},
- {0, 0x03, 157},
- {0, 0x03, 158},
- {0, 0x03, 165},
- {0, 0x03, 166},
- {0, 0x03, 168},
- {0, 0x03, 174},
- {0, 0x03, 175},
- {0, 0x03, 180},
- {0, 0x03, 182},
- {0, 0x03, 183},
+ {0xc000, 147},
+ {0xc000, 149},
+ {0xc000, 150},
+ {0xc000, 151},
+ {0xc000, 152},
+ {0xc000, 155},
+ {0xc000, 157},
+ {0xc000, 158},
+ {0xc000, 165},
+ {0xc000, 166},
+ {0xc000, 168},
+ {0xc000, 174},
+ {0xc000, 175},
+ {0xc000, 180},
+ {0xc000, 182},
+ {0xc000, 183},
},
/* 155 */
{
- {1, 0x02, 147},
- {22, 0x03, 147},
- {1, 0x02, 149},
- {22, 0x03, 149},
- {1, 0x02, 150},
- {22, 0x03, 150},
- {1, 0x02, 151},
- {22, 0x03, 151},
- {1, 0x02, 152},
- {22, 0x03, 152},
- {1, 0x02, 155},
- {22, 0x03, 155},
- {1, 0x02, 157},
- {22, 0x03, 157},
- {1, 0x02, 158},
- {22, 0x03, 158},
+ {0x8001, 147},
+ {0xc016, 147},
+ {0x8001, 149},
+ {0xc016, 149},
+ {0x8001, 150},
+ {0xc016, 150},
+ {0x8001, 151},
+ {0xc016, 151},
+ {0x8001, 152},
+ {0xc016, 152},
+ {0x8001, 155},
+ {0xc016, 155},
+ {0x8001, 157},
+ {0xc016, 157},
+ {0x8001, 158},
+ {0xc016, 158},
},
/* 156 */
{
- {2, 0x02, 147},
- {9, 0x02, 147},
- {23, 0x02, 147},
- {40, 0x03, 147},
- {2, 0x02, 149},
- {9, 0x02, 149},
- {23, 0x02, 149},
- {40, 0x03, 149},
- {2, 0x02, 150},
- {9, 0x02, 150},
- {23, 0x02, 150},
- {40, 0x03, 150},
- {2, 0x02, 151},
- {9, 0x02, 151},
- {23, 0x02, 151},
- {40, 0x03, 151},
+ {0x8002, 147},
+ {0x8009, 147},
+ {0x8017, 147},
+ {0xc028, 147},
+ {0x8002, 149},
+ {0x8009, 149},
+ {0x8017, 149},
+ {0xc028, 149},
+ {0x8002, 150},
+ {0x8009, 150},
+ {0x8017, 150},
+ {0xc028, 150},
+ {0x8002, 151},
+ {0x8009, 151},
+ {0x8017, 151},
+ {0xc028, 151},
},
/* 157 */
{
- {3, 0x02, 147},
- {6, 0x02, 147},
- {10, 0x02, 147},
- {15, 0x02, 147},
- {24, 0x02, 147},
- {31, 0x02, 147},
- {41, 0x02, 147},
- {56, 0x03, 147},
- {3, 0x02, 149},
- {6, 0x02, 149},
- {10, 0x02, 149},
- {15, 0x02, 149},
- {24, 0x02, 149},
- {31, 0x02, 149},
- {41, 0x02, 149},
- {56, 0x03, 149},
+ {0x8003, 147},
+ {0x8006, 147},
+ {0x800a, 147},
+ {0x800f, 147},
+ {0x8018, 147},
+ {0x801f, 147},
+ {0x8029, 147},
+ {0xc038, 147},
+ {0x8003, 149},
+ {0x8006, 149},
+ {0x800a, 149},
+ {0x800f, 149},
+ {0x8018, 149},
+ {0x801f, 149},
+ {0x8029, 149},
+ {0xc038, 149},
},
/* 158 */
{
- {3, 0x02, 150},
- {6, 0x02, 150},
- {10, 0x02, 150},
- {15, 0x02, 150},
- {24, 0x02, 150},
- {31, 0x02, 150},
- {41, 0x02, 150},
- {56, 0x03, 150},
- {3, 0x02, 151},
- {6, 0x02, 151},
- {10, 0x02, 151},
- {15, 0x02, 151},
- {24, 0x02, 151},
- {31, 0x02, 151},
- {41, 0x02, 151},
- {56, 0x03, 151},
+ {0x8003, 150},
+ {0x8006, 150},
+ {0x800a, 150},
+ {0x800f, 150},
+ {0x8018, 150},
+ {0x801f, 150},
+ {0x8029, 150},
+ {0xc038, 150},
+ {0x8003, 151},
+ {0x8006, 151},
+ {0x800a, 151},
+ {0x800f, 151},
+ {0x8018, 151},
+ {0x801f, 151},
+ {0x8029, 151},
+ {0xc038, 151},
},
/* 159 */
{
- {2, 0x02, 152},
- {9, 0x02, 152},
- {23, 0x02, 152},
- {40, 0x03, 152},
- {2, 0x02, 155},
- {9, 0x02, 155},
- {23, 0x02, 155},
- {40, 0x03, 155},
- {2, 0x02, 157},
- {9, 0x02, 157},
- {23, 0x02, 157},
- {40, 0x03, 157},
- {2, 0x02, 158},
- {9, 0x02, 158},
- {23, 0x02, 158},
- {40, 0x03, 158},
+ {0x8002, 152},
+ {0x8009, 152},
+ {0x8017, 152},
+ {0xc028, 152},
+ {0x8002, 155},
+ {0x8009, 155},
+ {0x8017, 155},
+ {0xc028, 155},
+ {0x8002, 157},
+ {0x8009, 157},
+ {0x8017, 157},
+ {0xc028, 157},
+ {0x8002, 158},
+ {0x8009, 158},
+ {0x8017, 158},
+ {0xc028, 158},
},
/* 160 */
{
- {3, 0x02, 152},
- {6, 0x02, 152},
- {10, 0x02, 152},
- {15, 0x02, 152},
- {24, 0x02, 152},
- {31, 0x02, 152},
- {41, 0x02, 152},
- {56, 0x03, 152},
- {3, 0x02, 155},
- {6, 0x02, 155},
- {10, 0x02, 155},
- {15, 0x02, 155},
- {24, 0x02, 155},
- {31, 0x02, 155},
- {41, 0x02, 155},
- {56, 0x03, 155},
+ {0x8003, 152},
+ {0x8006, 152},
+ {0x800a, 152},
+ {0x800f, 152},
+ {0x8018, 152},
+ {0x801f, 152},
+ {0x8029, 152},
+ {0xc038, 152},
+ {0x8003, 155},
+ {0x8006, 155},
+ {0x800a, 155},
+ {0x800f, 155},
+ {0x8018, 155},
+ {0x801f, 155},
+ {0x8029, 155},
+ {0xc038, 155},
},
/* 161 */
{
- {3, 0x02, 157},
- {6, 0x02, 157},
- {10, 0x02, 157},
- {15, 0x02, 157},
- {24, 0x02, 157},
- {31, 0x02, 157},
- {41, 0x02, 157},
- {56, 0x03, 157},
- {3, 0x02, 158},
- {6, 0x02, 158},
- {10, 0x02, 158},
- {15, 0x02, 158},
- {24, 0x02, 158},
- {31, 0x02, 158},
- {41, 0x02, 158},
- {56, 0x03, 158},
+ {0x8003, 157},
+ {0x8006, 157},
+ {0x800a, 157},
+ {0x800f, 157},
+ {0x8018, 157},
+ {0x801f, 157},
+ {0x8029, 157},
+ {0xc038, 157},
+ {0x8003, 158},
+ {0x8006, 158},
+ {0x800a, 158},
+ {0x800f, 158},
+ {0x8018, 158},
+ {0x801f, 158},
+ {0x8029, 158},
+ {0xc038, 158},
},
/* 162 */
{
- {1, 0x02, 165},
- {22, 0x03, 165},
- {1, 0x02, 166},
- {22, 0x03, 166},
- {1, 0x02, 168},
- {22, 0x03, 168},
- {1, 0x02, 174},
- {22, 0x03, 174},
- {1, 0x02, 175},
- {22, 0x03, 175},
- {1, 0x02, 180},
- {22, 0x03, 180},
- {1, 0x02, 182},
- {22, 0x03, 182},
- {1, 0x02, 183},
- {22, 0x03, 183},
+ {0x8001, 165},
+ {0xc016, 165},
+ {0x8001, 166},
+ {0xc016, 166},
+ {0x8001, 168},
+ {0xc016, 168},
+ {0x8001, 174},
+ {0xc016, 174},
+ {0x8001, 175},
+ {0xc016, 175},
+ {0x8001, 180},
+ {0xc016, 180},
+ {0x8001, 182},
+ {0xc016, 182},
+ {0x8001, 183},
+ {0xc016, 183},
},
/* 163 */
{
- {2, 0x02, 165},
- {9, 0x02, 165},
- {23, 0x02, 165},
- {40, 0x03, 165},
- {2, 0x02, 166},
- {9, 0x02, 166},
- {23, 0x02, 166},
- {40, 0x03, 166},
- {2, 0x02, 168},
- {9, 0x02, 168},
- {23, 0x02, 168},
- {40, 0x03, 168},
- {2, 0x02, 174},
- {9, 0x02, 174},
- {23, 0x02, 174},
- {40, 0x03, 174},
+ {0x8002, 165},
+ {0x8009, 165},
+ {0x8017, 165},
+ {0xc028, 165},
+ {0x8002, 166},
+ {0x8009, 166},
+ {0x8017, 166},
+ {0xc028, 166},
+ {0x8002, 168},
+ {0x8009, 168},
+ {0x8017, 168},
+ {0xc028, 168},
+ {0x8002, 174},
+ {0x8009, 174},
+ {0x8017, 174},
+ {0xc028, 174},
},
/* 164 */
{
- {3, 0x02, 165},
- {6, 0x02, 165},
- {10, 0x02, 165},
- {15, 0x02, 165},
- {24, 0x02, 165},
- {31, 0x02, 165},
- {41, 0x02, 165},
- {56, 0x03, 165},
- {3, 0x02, 166},
- {6, 0x02, 166},
- {10, 0x02, 166},
- {15, 0x02, 166},
- {24, 0x02, 166},
- {31, 0x02, 166},
- {41, 0x02, 166},
- {56, 0x03, 166},
+ {0x8003, 165},
+ {0x8006, 165},
+ {0x800a, 165},
+ {0x800f, 165},
+ {0x8018, 165},
+ {0x801f, 165},
+ {0x8029, 165},
+ {0xc038, 165},
+ {0x8003, 166},
+ {0x8006, 166},
+ {0x800a, 166},
+ {0x800f, 166},
+ {0x8018, 166},
+ {0x801f, 166},
+ {0x8029, 166},
+ {0xc038, 166},
},
/* 165 */
{
- {3, 0x02, 168},
- {6, 0x02, 168},
- {10, 0x02, 168},
- {15, 0x02, 168},
- {24, 0x02, 168},
- {31, 0x02, 168},
- {41, 0x02, 168},
- {56, 0x03, 168},
- {3, 0x02, 174},
- {6, 0x02, 174},
- {10, 0x02, 174},
- {15, 0x02, 174},
- {24, 0x02, 174},
- {31, 0x02, 174},
- {41, 0x02, 174},
- {56, 0x03, 174},
+ {0x8003, 168},
+ {0x8006, 168},
+ {0x800a, 168},
+ {0x800f, 168},
+ {0x8018, 168},
+ {0x801f, 168},
+ {0x8029, 168},
+ {0xc038, 168},
+ {0x8003, 174},
+ {0x8006, 174},
+ {0x800a, 174},
+ {0x800f, 174},
+ {0x8018, 174},
+ {0x801f, 174},
+ {0x8029, 174},
+ {0xc038, 174},
},
/* 166 */
{
- {2, 0x02, 175},
- {9, 0x02, 175},
- {23, 0x02, 175},
- {40, 0x03, 175},
- {2, 0x02, 180},
- {9, 0x02, 180},
- {23, 0x02, 180},
- {40, 0x03, 180},
- {2, 0x02, 182},
- {9, 0x02, 182},
- {23, 0x02, 182},
- {40, 0x03, 182},
- {2, 0x02, 183},
- {9, 0x02, 183},
- {23, 0x02, 183},
- {40, 0x03, 183},
+ {0x8002, 175},
+ {0x8009, 175},
+ {0x8017, 175},
+ {0xc028, 175},
+ {0x8002, 180},
+ {0x8009, 180},
+ {0x8017, 180},
+ {0xc028, 180},
+ {0x8002, 182},
+ {0x8009, 182},
+ {0x8017, 182},
+ {0xc028, 182},
+ {0x8002, 183},
+ {0x8009, 183},
+ {0x8017, 183},
+ {0xc028, 183},
},
/* 167 */
{
- {3, 0x02, 175},
- {6, 0x02, 175},
- {10, 0x02, 175},
- {15, 0x02, 175},
- {24, 0x02, 175},
- {31, 0x02, 175},
- {41, 0x02, 175},
- {56, 0x03, 175},
- {3, 0x02, 180},
- {6, 0x02, 180},
- {10, 0x02, 180},
- {15, 0x02, 180},
- {24, 0x02, 180},
- {31, 0x02, 180},
- {41, 0x02, 180},
- {56, 0x03, 180},
+ {0x8003, 175},
+ {0x8006, 175},
+ {0x800a, 175},
+ {0x800f, 175},
+ {0x8018, 175},
+ {0x801f, 175},
+ {0x8029, 175},
+ {0xc038, 175},
+ {0x8003, 180},
+ {0x8006, 180},
+ {0x800a, 180},
+ {0x800f, 180},
+ {0x8018, 180},
+ {0x801f, 180},
+ {0x8029, 180},
+ {0xc038, 180},
},
/* 168 */
{
- {3, 0x02, 182},
- {6, 0x02, 182},
- {10, 0x02, 182},
- {15, 0x02, 182},
- {24, 0x02, 182},
- {31, 0x02, 182},
- {41, 0x02, 182},
- {56, 0x03, 182},
- {3, 0x02, 183},
- {6, 0x02, 183},
- {10, 0x02, 183},
- {15, 0x02, 183},
- {24, 0x02, 183},
- {31, 0x02, 183},
- {41, 0x02, 183},
- {56, 0x03, 183},
+ {0x8003, 182},
+ {0x8006, 182},
+ {0x800a, 182},
+ {0x800f, 182},
+ {0x8018, 182},
+ {0x801f, 182},
+ {0x8029, 182},
+ {0xc038, 182},
+ {0x8003, 183},
+ {0x8006, 183},
+ {0x800a, 183},
+ {0x800f, 183},
+ {0x8018, 183},
+ {0x801f, 183},
+ {0x8029, 183},
+ {0xc038, 183},
},
/* 169 */
{
- {0, 0x03, 188},
- {0, 0x03, 191},
- {0, 0x03, 197},
- {0, 0x03, 231},
- {0, 0x03, 239},
- {176, 0x00, 0},
- {178, 0x00, 0},
- {179, 0x00, 0},
- {183, 0x00, 0},
- {184, 0x00, 0},
- {186, 0x00, 0},
- {187, 0x00, 0},
- {192, 0x00, 0},
- {199, 0x00, 0},
- {208, 0x00, 0},
- {223, 0x00, 0},
+ {0xc000, 188},
+ {0xc000, 191},
+ {0xc000, 197},
+ {0xc000, 231},
+ {0xc000, 239},
+ {0xb0, 0},
+ {0xb2, 0},
+ {0xb3, 0},
+ {0xb7, 0},
+ {0xb8, 0},
+ {0xba, 0},
+ {0xbb, 0},
+ {0xc0, 0},
+ {0xc7, 0},
+ {0xd0, 0},
+ {0xdf, 0},
},
/* 170 */
{
- {1, 0x02, 188},
- {22, 0x03, 188},
- {1, 0x02, 191},
- {22, 0x03, 191},
- {1, 0x02, 197},
- {22, 0x03, 197},
- {1, 0x02, 231},
- {22, 0x03, 231},
- {1, 0x02, 239},
- {22, 0x03, 239},
- {0, 0x03, 9},
- {0, 0x03, 142},
- {0, 0x03, 144},
- {0, 0x03, 145},
- {0, 0x03, 148},
- {0, 0x03, 159},
+ {0x8001, 188},
+ {0xc016, 188},
+ {0x8001, 191},
+ {0xc016, 191},
+ {0x8001, 197},
+ {0xc016, 197},
+ {0x8001, 231},
+ {0xc016, 231},
+ {0x8001, 239},
+ {0xc016, 239},
+ {0xc000, 9},
+ {0xc000, 142},
+ {0xc000, 144},
+ {0xc000, 145},
+ {0xc000, 148},
+ {0xc000, 159},
},
/* 171 */
{
- {2, 0x02, 188},
- {9, 0x02, 188},
- {23, 0x02, 188},
- {40, 0x03, 188},
- {2, 0x02, 191},
- {9, 0x02, 191},
- {23, 0x02, 191},
- {40, 0x03, 191},
- {2, 0x02, 197},
- {9, 0x02, 197},
- {23, 0x02, 197},
- {40, 0x03, 197},
- {2, 0x02, 231},
- {9, 0x02, 231},
- {23, 0x02, 231},
- {40, 0x03, 231},
+ {0x8002, 188},
+ {0x8009, 188},
+ {0x8017, 188},
+ {0xc028, 188},
+ {0x8002, 191},
+ {0x8009, 191},
+ {0x8017, 191},
+ {0xc028, 191},
+ {0x8002, 197},
+ {0x8009, 197},
+ {0x8017, 197},
+ {0xc028, 197},
+ {0x8002, 231},
+ {0x8009, 231},
+ {0x8017, 231},
+ {0xc028, 231},
},
/* 172 */
{
- {3, 0x02, 188},
- {6, 0x02, 188},
- {10, 0x02, 188},
- {15, 0x02, 188},
- {24, 0x02, 188},
- {31, 0x02, 188},
- {41, 0x02, 188},
- {56, 0x03, 188},
- {3, 0x02, 191},
- {6, 0x02, 191},
- {10, 0x02, 191},
- {15, 0x02, 191},
- {24, 0x02, 191},
- {31, 0x02, 191},
- {41, 0x02, 191},
- {56, 0x03, 191},
+ {0x8003, 188},
+ {0x8006, 188},
+ {0x800a, 188},
+ {0x800f, 188},
+ {0x8018, 188},
+ {0x801f, 188},
+ {0x8029, 188},
+ {0xc038, 188},
+ {0x8003, 191},
+ {0x8006, 191},
+ {0x800a, 191},
+ {0x800f, 191},
+ {0x8018, 191},
+ {0x801f, 191},
+ {0x8029, 191},
+ {0xc038, 191},
},
/* 173 */
{
- {3, 0x02, 197},
- {6, 0x02, 197},
- {10, 0x02, 197},
- {15, 0x02, 197},
- {24, 0x02, 197},
- {31, 0x02, 197},
- {41, 0x02, 197},
- {56, 0x03, 197},
- {3, 0x02, 231},
- {6, 0x02, 231},
- {10, 0x02, 231},
- {15, 0x02, 231},
- {24, 0x02, 231},
- {31, 0x02, 231},
- {41, 0x02, 231},
- {56, 0x03, 231},
+ {0x8003, 197},
+ {0x8006, 197},
+ {0x800a, 197},
+ {0x800f, 197},
+ {0x8018, 197},
+ {0x801f, 197},
+ {0x8029, 197},
+ {0xc038, 197},
+ {0x8003, 231},
+ {0x8006, 231},
+ {0x800a, 231},
+ {0x800f, 231},
+ {0x8018, 231},
+ {0x801f, 231},
+ {0x8029, 231},
+ {0xc038, 231},
},
/* 174 */
{
- {2, 0x02, 239},
- {9, 0x02, 239},
- {23, 0x02, 239},
- {40, 0x03, 239},
- {1, 0x02, 9},
- {22, 0x03, 9},
- {1, 0x02, 142},
- {22, 0x03, 142},
- {1, 0x02, 144},
- {22, 0x03, 144},
- {1, 0x02, 145},
- {22, 0x03, 145},
- {1, 0x02, 148},
- {22, 0x03, 148},
- {1, 0x02, 159},
- {22, 0x03, 159},
+ {0x8002, 239},
+ {0x8009, 239},
+ {0x8017, 239},
+ {0xc028, 239},
+ {0x8001, 9},
+ {0xc016, 9},
+ {0x8001, 142},
+ {0xc016, 142},
+ {0x8001, 144},
+ {0xc016, 144},
+ {0x8001, 145},
+ {0xc016, 145},
+ {0x8001, 148},
+ {0xc016, 148},
+ {0x8001, 159},
+ {0xc016, 159},
},
/* 175 */
{
- {3, 0x02, 239},
- {6, 0x02, 239},
- {10, 0x02, 239},
- {15, 0x02, 239},
- {24, 0x02, 239},
- {31, 0x02, 239},
- {41, 0x02, 239},
- {56, 0x03, 239},
- {2, 0x02, 9},
- {9, 0x02, 9},
- {23, 0x02, 9},
- {40, 0x03, 9},
- {2, 0x02, 142},
- {9, 0x02, 142},
- {23, 0x02, 142},
- {40, 0x03, 142},
+ {0x8003, 239},
+ {0x8006, 239},
+ {0x800a, 239},
+ {0x800f, 239},
+ {0x8018, 239},
+ {0x801f, 239},
+ {0x8029, 239},
+ {0xc038, 239},
+ {0x8002, 9},
+ {0x8009, 9},
+ {0x8017, 9},
+ {0xc028, 9},
+ {0x8002, 142},
+ {0x8009, 142},
+ {0x8017, 142},
+ {0xc028, 142},
},
/* 176 */
{
- {3, 0x02, 9},
- {6, 0x02, 9},
- {10, 0x02, 9},
- {15, 0x02, 9},
- {24, 0x02, 9},
- {31, 0x02, 9},
- {41, 0x02, 9},
- {56, 0x03, 9},
- {3, 0x02, 142},
- {6, 0x02, 142},
- {10, 0x02, 142},
- {15, 0x02, 142},
- {24, 0x02, 142},
- {31, 0x02, 142},
- {41, 0x02, 142},
- {56, 0x03, 142},
+ {0x8003, 9},
+ {0x8006, 9},
+ {0x800a, 9},
+ {0x800f, 9},
+ {0x8018, 9},
+ {0x801f, 9},
+ {0x8029, 9},
+ {0xc038, 9},
+ {0x8003, 142},
+ {0x8006, 142},
+ {0x800a, 142},
+ {0x800f, 142},
+ {0x8018, 142},
+ {0x801f, 142},
+ {0x8029, 142},
+ {0xc038, 142},
},
/* 177 */
{
- {2, 0x02, 144},
- {9, 0x02, 144},
- {23, 0x02, 144},
- {40, 0x03, 144},
- {2, 0x02, 145},
- {9, 0x02, 145},
- {23, 0x02, 145},
- {40, 0x03, 145},
- {2, 0x02, 148},
- {9, 0x02, 148},
- {23, 0x02, 148},
- {40, 0x03, 148},
- {2, 0x02, 159},
- {9, 0x02, 159},
- {23, 0x02, 159},
- {40, 0x03, 159},
+ {0x8002, 144},
+ {0x8009, 144},
+ {0x8017, 144},
+ {0xc028, 144},
+ {0x8002, 145},
+ {0x8009, 145},
+ {0x8017, 145},
+ {0xc028, 145},
+ {0x8002, 148},
+ {0x8009, 148},
+ {0x8017, 148},
+ {0xc028, 148},
+ {0x8002, 159},
+ {0x8009, 159},
+ {0x8017, 159},
+ {0xc028, 159},
},
/* 178 */
{
- {3, 0x02, 144},
- {6, 0x02, 144},
- {10, 0x02, 144},
- {15, 0x02, 144},
- {24, 0x02, 144},
- {31, 0x02, 144},
- {41, 0x02, 144},
- {56, 0x03, 144},
- {3, 0x02, 145},
- {6, 0x02, 145},
- {10, 0x02, 145},
- {15, 0x02, 145},
- {24, 0x02, 145},
- {31, 0x02, 145},
- {41, 0x02, 145},
- {56, 0x03, 145},
+ {0x8003, 144},
+ {0x8006, 144},
+ {0x800a, 144},
+ {0x800f, 144},
+ {0x8018, 144},
+ {0x801f, 144},
+ {0x8029, 144},
+ {0xc038, 144},
+ {0x8003, 145},
+ {0x8006, 145},
+ {0x800a, 145},
+ {0x800f, 145},
+ {0x8018, 145},
+ {0x801f, 145},
+ {0x8029, 145},
+ {0xc038, 145},
},
/* 179 */
{
- {3, 0x02, 148},
- {6, 0x02, 148},
- {10, 0x02, 148},
- {15, 0x02, 148},
- {24, 0x02, 148},
- {31, 0x02, 148},
- {41, 0x02, 148},
- {56, 0x03, 148},
- {3, 0x02, 159},
- {6, 0x02, 159},
- {10, 0x02, 159},
- {15, 0x02, 159},
- {24, 0x02, 159},
- {31, 0x02, 159},
- {41, 0x02, 159},
- {56, 0x03, 159},
+ {0x8003, 148},
+ {0x8006, 148},
+ {0x800a, 148},
+ {0x800f, 148},
+ {0x8018, 148},
+ {0x801f, 148},
+ {0x8029, 148},
+ {0xc038, 148},
+ {0x8003, 159},
+ {0x8006, 159},
+ {0x800a, 159},
+ {0x800f, 159},
+ {0x8018, 159},
+ {0x801f, 159},
+ {0x8029, 159},
+ {0xc038, 159},
},
/* 180 */
{
- {0, 0x03, 171},
- {0, 0x03, 206},
- {0, 0x03, 215},
- {0, 0x03, 225},
- {0, 0x03, 236},
- {0, 0x03, 237},
- {188, 0x00, 0},
- {189, 0x00, 0},
- {193, 0x00, 0},
- {196, 0x00, 0},
- {200, 0x00, 0},
- {203, 0x00, 0},
- {209, 0x00, 0},
- {216, 0x00, 0},
- {224, 0x00, 0},
- {238, 0x00, 0},
+ {0xc000, 171},
+ {0xc000, 206},
+ {0xc000, 215},
+ {0xc000, 225},
+ {0xc000, 236},
+ {0xc000, 237},
+ {0xbc, 0},
+ {0xbd, 0},
+ {0xc1, 0},
+ {0xc4, 0},
+ {0xc8, 0},
+ {0xcb, 0},
+ {0xd1, 0},
+ {0xd8, 0},
+ {0xe0, 0},
+ {0xee, 0},
},
/* 181 */
{
- {1, 0x02, 171},
- {22, 0x03, 171},
- {1, 0x02, 206},
- {22, 0x03, 206},
- {1, 0x02, 215},
- {22, 0x03, 215},
- {1, 0x02, 225},
- {22, 0x03, 225},
- {1, 0x02, 236},
- {22, 0x03, 236},
- {1, 0x02, 237},
- {22, 0x03, 237},
- {0, 0x03, 199},
- {0, 0x03, 207},
- {0, 0x03, 234},
- {0, 0x03, 235},
+ {0x8001, 171},
+ {0xc016, 171},
+ {0x8001, 206},
+ {0xc016, 206},
+ {0x8001, 215},
+ {0xc016, 215},
+ {0x8001, 225},
+ {0xc016, 225},
+ {0x8001, 236},
+ {0xc016, 236},
+ {0x8001, 237},
+ {0xc016, 237},
+ {0xc000, 199},
+ {0xc000, 207},
+ {0xc000, 234},
+ {0xc000, 235},
},
/* 182 */
{
- {2, 0x02, 171},
- {9, 0x02, 171},
- {23, 0x02, 171},
- {40, 0x03, 171},
- {2, 0x02, 206},
- {9, 0x02, 206},
- {23, 0x02, 206},
- {40, 0x03, 206},
- {2, 0x02, 215},
- {9, 0x02, 215},
- {23, 0x02, 215},
- {40, 0x03, 215},
- {2, 0x02, 225},
- {9, 0x02, 225},
- {23, 0x02, 225},
- {40, 0x03, 225},
+ {0x8002, 171},
+ {0x8009, 171},
+ {0x8017, 171},
+ {0xc028, 171},
+ {0x8002, 206},
+ {0x8009, 206},
+ {0x8017, 206},
+ {0xc028, 206},
+ {0x8002, 215},
+ {0x8009, 215},
+ {0x8017, 215},
+ {0xc028, 215},
+ {0x8002, 225},
+ {0x8009, 225},
+ {0x8017, 225},
+ {0xc028, 225},
},
/* 183 */
{
- {3, 0x02, 171},
- {6, 0x02, 171},
- {10, 0x02, 171},
- {15, 0x02, 171},
- {24, 0x02, 171},
- {31, 0x02, 171},
- {41, 0x02, 171},
- {56, 0x03, 171},
- {3, 0x02, 206},
- {6, 0x02, 206},
- {10, 0x02, 206},
- {15, 0x02, 206},
- {24, 0x02, 206},
- {31, 0x02, 206},
- {41, 0x02, 206},
- {56, 0x03, 206},
+ {0x8003, 171},
+ {0x8006, 171},
+ {0x800a, 171},
+ {0x800f, 171},
+ {0x8018, 171},
+ {0x801f, 171},
+ {0x8029, 171},
+ {0xc038, 171},
+ {0x8003, 206},
+ {0x8006, 206},
+ {0x800a, 206},
+ {0x800f, 206},
+ {0x8018, 206},
+ {0x801f, 206},
+ {0x8029, 206},
+ {0xc038, 206},
},
/* 184 */
{
- {3, 0x02, 215},
- {6, 0x02, 215},
- {10, 0x02, 215},
- {15, 0x02, 215},
- {24, 0x02, 215},
- {31, 0x02, 215},
- {41, 0x02, 215},
- {56, 0x03, 215},
- {3, 0x02, 225},
- {6, 0x02, 225},
- {10, 0x02, 225},
- {15, 0x02, 225},
- {24, 0x02, 225},
- {31, 0x02, 225},
- {41, 0x02, 225},
- {56, 0x03, 225},
+ {0x8003, 215},
+ {0x8006, 215},
+ {0x800a, 215},
+ {0x800f, 215},
+ {0x8018, 215},
+ {0x801f, 215},
+ {0x8029, 215},
+ {0xc038, 215},
+ {0x8003, 225},
+ {0x8006, 225},
+ {0x800a, 225},
+ {0x800f, 225},
+ {0x8018, 225},
+ {0x801f, 225},
+ {0x8029, 225},
+ {0xc038, 225},
},
/* 185 */
{
- {2, 0x02, 236},
- {9, 0x02, 236},
- {23, 0x02, 236},
- {40, 0x03, 236},
- {2, 0x02, 237},
- {9, 0x02, 237},
- {23, 0x02, 237},
- {40, 0x03, 237},
- {1, 0x02, 199},
- {22, 0x03, 199},
- {1, 0x02, 207},
- {22, 0x03, 207},
- {1, 0x02, 234},
- {22, 0x03, 234},
- {1, 0x02, 235},
- {22, 0x03, 235},
+ {0x8002, 236},
+ {0x8009, 236},
+ {0x8017, 236},
+ {0xc028, 236},
+ {0x8002, 237},
+ {0x8009, 237},
+ {0x8017, 237},
+ {0xc028, 237},
+ {0x8001, 199},
+ {0xc016, 199},
+ {0x8001, 207},
+ {0xc016, 207},
+ {0x8001, 234},
+ {0xc016, 234},
+ {0x8001, 235},
+ {0xc016, 235},
},
/* 186 */
{
- {3, 0x02, 236},
- {6, 0x02, 236},
- {10, 0x02, 236},
- {15, 0x02, 236},
- {24, 0x02, 236},
- {31, 0x02, 236},
- {41, 0x02, 236},
- {56, 0x03, 236},
- {3, 0x02, 237},
- {6, 0x02, 237},
- {10, 0x02, 237},
- {15, 0x02, 237},
- {24, 0x02, 237},
- {31, 0x02, 237},
- {41, 0x02, 237},
- {56, 0x03, 237},
+ {0x8003, 236},
+ {0x8006, 236},
+ {0x800a, 236},
+ {0x800f, 236},
+ {0x8018, 236},
+ {0x801f, 236},
+ {0x8029, 236},
+ {0xc038, 236},
+ {0x8003, 237},
+ {0x8006, 237},
+ {0x800a, 237},
+ {0x800f, 237},
+ {0x8018, 237},
+ {0x801f, 237},
+ {0x8029, 237},
+ {0xc038, 237},
},
/* 187 */
{
- {2, 0x02, 199},
- {9, 0x02, 199},
- {23, 0x02, 199},
- {40, 0x03, 199},
- {2, 0x02, 207},
- {9, 0x02, 207},
- {23, 0x02, 207},
- {40, 0x03, 207},
- {2, 0x02, 234},
- {9, 0x02, 234},
- {23, 0x02, 234},
- {40, 0x03, 234},
- {2, 0x02, 235},
- {9, 0x02, 235},
- {23, 0x02, 235},
- {40, 0x03, 235},
+ {0x8002, 199},
+ {0x8009, 199},
+ {0x8017, 199},
+ {0xc028, 199},
+ {0x8002, 207},
+ {0x8009, 207},
+ {0x8017, 207},
+ {0xc028, 207},
+ {0x8002, 234},
+ {0x8009, 234},
+ {0x8017, 234},
+ {0xc028, 234},
+ {0x8002, 235},
+ {0x8009, 235},
+ {0x8017, 235},
+ {0xc028, 235},
},
/* 188 */
{
- {3, 0x02, 199},
- {6, 0x02, 199},
- {10, 0x02, 199},
- {15, 0x02, 199},
- {24, 0x02, 199},
- {31, 0x02, 199},
- {41, 0x02, 199},
- {56, 0x03, 199},
- {3, 0x02, 207},
- {6, 0x02, 207},
- {10, 0x02, 207},
- {15, 0x02, 207},
- {24, 0x02, 207},
- {31, 0x02, 207},
- {41, 0x02, 207},
- {56, 0x03, 207},
+ {0x8003, 199},
+ {0x8006, 199},
+ {0x800a, 199},
+ {0x800f, 199},
+ {0x8018, 199},
+ {0x801f, 199},
+ {0x8029, 199},
+ {0xc038, 199},
+ {0x8003, 207},
+ {0x8006, 207},
+ {0x800a, 207},
+ {0x800f, 207},
+ {0x8018, 207},
+ {0x801f, 207},
+ {0x8029, 207},
+ {0xc038, 207},
},
/* 189 */
{
- {3, 0x02, 234},
- {6, 0x02, 234},
- {10, 0x02, 234},
- {15, 0x02, 234},
- {24, 0x02, 234},
- {31, 0x02, 234},
- {41, 0x02, 234},
- {56, 0x03, 234},
- {3, 0x02, 235},
- {6, 0x02, 235},
- {10, 0x02, 235},
- {15, 0x02, 235},
- {24, 0x02, 235},
- {31, 0x02, 235},
- {41, 0x02, 235},
- {56, 0x03, 235},
+ {0x8003, 234},
+ {0x8006, 234},
+ {0x800a, 234},
+ {0x800f, 234},
+ {0x8018, 234},
+ {0x801f, 234},
+ {0x8029, 234},
+ {0xc038, 234},
+ {0x8003, 235},
+ {0x8006, 235},
+ {0x800a, 235},
+ {0x800f, 235},
+ {0x8018, 235},
+ {0x801f, 235},
+ {0x8029, 235},
+ {0xc038, 235},
},
/* 190 */
{
- {194, 0x00, 0},
- {195, 0x00, 0},
- {197, 0x00, 0},
- {198, 0x00, 0},
- {201, 0x00, 0},
- {202, 0x00, 0},
- {204, 0x00, 0},
- {205, 0x00, 0},
- {210, 0x00, 0},
- {213, 0x00, 0},
- {217, 0x00, 0},
- {220, 0x00, 0},
- {225, 0x00, 0},
- {231, 0x00, 0},
- {239, 0x00, 0},
- {246, 0x00, 0},
+ {0xc2, 0},
+ {0xc3, 0},
+ {0xc5, 0},
+ {0xc6, 0},
+ {0xc9, 0},
+ {0xca, 0},
+ {0xcc, 0},
+ {0xcd, 0},
+ {0xd2, 0},
+ {0xd5, 0},
+ {0xd9, 0},
+ {0xdc, 0},
+ {0xe1, 0},
+ {0xe7, 0},
+ {0xef, 0},
+ {0xf6, 0},
},
/* 191 */
{
- {0, 0x03, 192},
- {0, 0x03, 193},
- {0, 0x03, 200},
- {0, 0x03, 201},
- {0, 0x03, 202},
- {0, 0x03, 205},
- {0, 0x03, 210},
- {0, 0x03, 213},
- {0, 0x03, 218},
- {0, 0x03, 219},
- {0, 0x03, 238},
- {0, 0x03, 240},
- {0, 0x03, 242},
- {0, 0x03, 243},
- {0, 0x03, 255},
- {206, 0x00, 0},
+ {0xc000, 192},
+ {0xc000, 193},
+ {0xc000, 200},
+ {0xc000, 201},
+ {0xc000, 202},
+ {0xc000, 205},
+ {0xc000, 210},
+ {0xc000, 213},
+ {0xc000, 218},
+ {0xc000, 219},
+ {0xc000, 238},
+ {0xc000, 240},
+ {0xc000, 242},
+ {0xc000, 243},
+ {0xc000, 255},
+ {0xce, 0},
},
/* 192 */
{
- {1, 0x02, 192},
- {22, 0x03, 192},
- {1, 0x02, 193},
- {22, 0x03, 193},
- {1, 0x02, 200},
- {22, 0x03, 200},
- {1, 0x02, 201},
- {22, 0x03, 201},
- {1, 0x02, 202},
- {22, 0x03, 202},
- {1, 0x02, 205},
- {22, 0x03, 205},
- {1, 0x02, 210},
- {22, 0x03, 210},
- {1, 0x02, 213},
- {22, 0x03, 213},
+ {0x8001, 192},
+ {0xc016, 192},
+ {0x8001, 193},
+ {0xc016, 193},
+ {0x8001, 200},
+ {0xc016, 200},
+ {0x8001, 201},
+ {0xc016, 201},
+ {0x8001, 202},
+ {0xc016, 202},
+ {0x8001, 205},
+ {0xc016, 205},
+ {0x8001, 210},
+ {0xc016, 210},
+ {0x8001, 213},
+ {0xc016, 213},
},
/* 193 */
{
- {2, 0x02, 192},
- {9, 0x02, 192},
- {23, 0x02, 192},
- {40, 0x03, 192},
- {2, 0x02, 193},
- {9, 0x02, 193},
- {23, 0x02, 193},
- {40, 0x03, 193},
- {2, 0x02, 200},
- {9, 0x02, 200},
- {23, 0x02, 200},
- {40, 0x03, 200},
- {2, 0x02, 201},
- {9, 0x02, 201},
- {23, 0x02, 201},
- {40, 0x03, 201},
+ {0x8002, 192},
+ {0x8009, 192},
+ {0x8017, 192},
+ {0xc028, 192},
+ {0x8002, 193},
+ {0x8009, 193},
+ {0x8017, 193},
+ {0xc028, 193},
+ {0x8002, 200},
+ {0x8009, 200},
+ {0x8017, 200},
+ {0xc028, 200},
+ {0x8002, 201},
+ {0x8009, 201},
+ {0x8017, 201},
+ {0xc028, 201},
},
/* 194 */
{
- {3, 0x02, 192},
- {6, 0x02, 192},
- {10, 0x02, 192},
- {15, 0x02, 192},
- {24, 0x02, 192},
- {31, 0x02, 192},
- {41, 0x02, 192},
- {56, 0x03, 192},
- {3, 0x02, 193},
- {6, 0x02, 193},
- {10, 0x02, 193},
- {15, 0x02, 193},
- {24, 0x02, 193},
- {31, 0x02, 193},
- {41, 0x02, 193},
- {56, 0x03, 193},
+ {0x8003, 192},
+ {0x8006, 192},
+ {0x800a, 192},
+ {0x800f, 192},
+ {0x8018, 192},
+ {0x801f, 192},
+ {0x8029, 192},
+ {0xc038, 192},
+ {0x8003, 193},
+ {0x8006, 193},
+ {0x800a, 193},
+ {0x800f, 193},
+ {0x8018, 193},
+ {0x801f, 193},
+ {0x8029, 193},
+ {0xc038, 193},
},
/* 195 */
{
- {3, 0x02, 200},
- {6, 0x02, 200},
- {10, 0x02, 200},
- {15, 0x02, 200},
- {24, 0x02, 200},
- {31, 0x02, 200},
- {41, 0x02, 200},
- {56, 0x03, 200},
- {3, 0x02, 201},
- {6, 0x02, 201},
- {10, 0x02, 201},
- {15, 0x02, 201},
- {24, 0x02, 201},
- {31, 0x02, 201},
- {41, 0x02, 201},
- {56, 0x03, 201},
+ {0x8003, 200},
+ {0x8006, 200},
+ {0x800a, 200},
+ {0x800f, 200},
+ {0x8018, 200},
+ {0x801f, 200},
+ {0x8029, 200},
+ {0xc038, 200},
+ {0x8003, 201},
+ {0x8006, 201},
+ {0x800a, 201},
+ {0x800f, 201},
+ {0x8018, 201},
+ {0x801f, 201},
+ {0x8029, 201},
+ {0xc038, 201},
},
/* 196 */
{
- {2, 0x02, 202},
- {9, 0x02, 202},
- {23, 0x02, 202},
- {40, 0x03, 202},
- {2, 0x02, 205},
- {9, 0x02, 205},
- {23, 0x02, 205},
- {40, 0x03, 205},
- {2, 0x02, 210},
- {9, 0x02, 210},
- {23, 0x02, 210},
- {40, 0x03, 210},
- {2, 0x02, 213},
- {9, 0x02, 213},
- {23, 0x02, 213},
- {40, 0x03, 213},
+ {0x8002, 202},
+ {0x8009, 202},
+ {0x8017, 202},
+ {0xc028, 202},
+ {0x8002, 205},
+ {0x8009, 205},
+ {0x8017, 205},
+ {0xc028, 205},
+ {0x8002, 210},
+ {0x8009, 210},
+ {0x8017, 210},
+ {0xc028, 210},
+ {0x8002, 213},
+ {0x8009, 213},
+ {0x8017, 213},
+ {0xc028, 213},
},
/* 197 */
{
- {3, 0x02, 202},
- {6, 0x02, 202},
- {10, 0x02, 202},
- {15, 0x02, 202},
- {24, 0x02, 202},
- {31, 0x02, 202},
- {41, 0x02, 202},
- {56, 0x03, 202},
- {3, 0x02, 205},
- {6, 0x02, 205},
- {10, 0x02, 205},
- {15, 0x02, 205},
- {24, 0x02, 205},
- {31, 0x02, 205},
- {41, 0x02, 205},
- {56, 0x03, 205},
+ {0x8003, 202},
+ {0x8006, 202},
+ {0x800a, 202},
+ {0x800f, 202},
+ {0x8018, 202},
+ {0x801f, 202},
+ {0x8029, 202},
+ {0xc038, 202},
+ {0x8003, 205},
+ {0x8006, 205},
+ {0x800a, 205},
+ {0x800f, 205},
+ {0x8018, 205},
+ {0x801f, 205},
+ {0x8029, 205},
+ {0xc038, 205},
},
/* 198 */
{
- {3, 0x02, 210},
- {6, 0x02, 210},
- {10, 0x02, 210},
- {15, 0x02, 210},
- {24, 0x02, 210},
- {31, 0x02, 210},
- {41, 0x02, 210},
- {56, 0x03, 210},
- {3, 0x02, 213},
- {6, 0x02, 213},
- {10, 0x02, 213},
- {15, 0x02, 213},
- {24, 0x02, 213},
- {31, 0x02, 213},
- {41, 0x02, 213},
- {56, 0x03, 213},
+ {0x8003, 210},
+ {0x8006, 210},
+ {0x800a, 210},
+ {0x800f, 210},
+ {0x8018, 210},
+ {0x801f, 210},
+ {0x8029, 210},
+ {0xc038, 210},
+ {0x8003, 213},
+ {0x8006, 213},
+ {0x800a, 213},
+ {0x800f, 213},
+ {0x8018, 213},
+ {0x801f, 213},
+ {0x8029, 213},
+ {0xc038, 213},
},
/* 199 */
{
- {1, 0x02, 218},
- {22, 0x03, 218},
- {1, 0x02, 219},
- {22, 0x03, 219},
- {1, 0x02, 238},
- {22, 0x03, 238},
- {1, 0x02, 240},
- {22, 0x03, 240},
- {1, 0x02, 242},
- {22, 0x03, 242},
- {1, 0x02, 243},
- {22, 0x03, 243},
- {1, 0x02, 255},
- {22, 0x03, 255},
- {0, 0x03, 203},
- {0, 0x03, 204},
+ {0x8001, 218},
+ {0xc016, 218},
+ {0x8001, 219},
+ {0xc016, 219},
+ {0x8001, 238},
+ {0xc016, 238},
+ {0x8001, 240},
+ {0xc016, 240},
+ {0x8001, 242},
+ {0xc016, 242},
+ {0x8001, 243},
+ {0xc016, 243},
+ {0x8001, 255},
+ {0xc016, 255},
+ {0xc000, 203},
+ {0xc000, 204},
},
/* 200 */
{
- {2, 0x02, 218},
- {9, 0x02, 218},
- {23, 0x02, 218},
- {40, 0x03, 218},
- {2, 0x02, 219},
- {9, 0x02, 219},
- {23, 0x02, 219},
- {40, 0x03, 219},
- {2, 0x02, 238},
- {9, 0x02, 238},
- {23, 0x02, 238},
- {40, 0x03, 238},
- {2, 0x02, 240},
- {9, 0x02, 240},
- {23, 0x02, 240},
- {40, 0x03, 240},
+ {0x8002, 218},
+ {0x8009, 218},
+ {0x8017, 218},
+ {0xc028, 218},
+ {0x8002, 219},
+ {0x8009, 219},
+ {0x8017, 219},
+ {0xc028, 219},
+ {0x8002, 238},
+ {0x8009, 238},
+ {0x8017, 238},
+ {0xc028, 238},
+ {0x8002, 240},
+ {0x8009, 240},
+ {0x8017, 240},
+ {0xc028, 240},
},
/* 201 */
{
- {3, 0x02, 218},
- {6, 0x02, 218},
- {10, 0x02, 218},
- {15, 0x02, 218},
- {24, 0x02, 218},
- {31, 0x02, 218},
- {41, 0x02, 218},
- {56, 0x03, 218},
- {3, 0x02, 219},
- {6, 0x02, 219},
- {10, 0x02, 219},
- {15, 0x02, 219},
- {24, 0x02, 219},
- {31, 0x02, 219},
- {41, 0x02, 219},
- {56, 0x03, 219},
+ {0x8003, 218},
+ {0x8006, 218},
+ {0x800a, 218},
+ {0x800f, 218},
+ {0x8018, 218},
+ {0x801f, 218},
+ {0x8029, 218},
+ {0xc038, 218},
+ {0x8003, 219},
+ {0x8006, 219},
+ {0x800a, 219},
+ {0x800f, 219},
+ {0x8018, 219},
+ {0x801f, 219},
+ {0x8029, 219},
+ {0xc038, 219},
},
/* 202 */
{
- {3, 0x02, 238},
- {6, 0x02, 238},
- {10, 0x02, 238},
- {15, 0x02, 238},
- {24, 0x02, 238},
- {31, 0x02, 238},
- {41, 0x02, 238},
- {56, 0x03, 238},
- {3, 0x02, 240},
- {6, 0x02, 240},
- {10, 0x02, 240},
- {15, 0x02, 240},
- {24, 0x02, 240},
- {31, 0x02, 240},
- {41, 0x02, 240},
- {56, 0x03, 240},
+ {0x8003, 238},
+ {0x8006, 238},
+ {0x800a, 238},
+ {0x800f, 238},
+ {0x8018, 238},
+ {0x801f, 238},
+ {0x8029, 238},
+ {0xc038, 238},
+ {0x8003, 240},
+ {0x8006, 240},
+ {0x800a, 240},
+ {0x800f, 240},
+ {0x8018, 240},
+ {0x801f, 240},
+ {0x8029, 240},
+ {0xc038, 240},
},
/* 203 */
{
- {2, 0x02, 242},
- {9, 0x02, 242},
- {23, 0x02, 242},
- {40, 0x03, 242},
- {2, 0x02, 243},
- {9, 0x02, 243},
- {23, 0x02, 243},
- {40, 0x03, 243},
- {2, 0x02, 255},
- {9, 0x02, 255},
- {23, 0x02, 255},
- {40, 0x03, 255},
- {1, 0x02, 203},
- {22, 0x03, 203},
- {1, 0x02, 204},
- {22, 0x03, 204},
+ {0x8002, 242},
+ {0x8009, 242},
+ {0x8017, 242},
+ {0xc028, 242},
+ {0x8002, 243},
+ {0x8009, 243},
+ {0x8017, 243},
+ {0xc028, 243},
+ {0x8002, 255},
+ {0x8009, 255},
+ {0x8017, 255},
+ {0xc028, 255},
+ {0x8001, 203},
+ {0xc016, 203},
+ {0x8001, 204},
+ {0xc016, 204},
},
/* 204 */
{
- {3, 0x02, 242},
- {6, 0x02, 242},
- {10, 0x02, 242},
- {15, 0x02, 242},
- {24, 0x02, 242},
- {31, 0x02, 242},
- {41, 0x02, 242},
- {56, 0x03, 242},
- {3, 0x02, 243},
- {6, 0x02, 243},
- {10, 0x02, 243},
- {15, 0x02, 243},
- {24, 0x02, 243},
- {31, 0x02, 243},
- {41, 0x02, 243},
- {56, 0x03, 243},
+ {0x8003, 242},
+ {0x8006, 242},
+ {0x800a, 242},
+ {0x800f, 242},
+ {0x8018, 242},
+ {0x801f, 242},
+ {0x8029, 242},
+ {0xc038, 242},
+ {0x8003, 243},
+ {0x8006, 243},
+ {0x800a, 243},
+ {0x800f, 243},
+ {0x8018, 243},
+ {0x801f, 243},
+ {0x8029, 243},
+ {0xc038, 243},
},
/* 205 */
{
- {3, 0x02, 255},
- {6, 0x02, 255},
- {10, 0x02, 255},
- {15, 0x02, 255},
- {24, 0x02, 255},
- {31, 0x02, 255},
- {41, 0x02, 255},
- {56, 0x03, 255},
- {2, 0x02, 203},
- {9, 0x02, 203},
- {23, 0x02, 203},
- {40, 0x03, 203},
- {2, 0x02, 204},
- {9, 0x02, 204},
- {23, 0x02, 204},
- {40, 0x03, 204},
+ {0x8003, 255},
+ {0x8006, 255},
+ {0x800a, 255},
+ {0x800f, 255},
+ {0x8018, 255},
+ {0x801f, 255},
+ {0x8029, 255},
+ {0xc038, 255},
+ {0x8002, 203},
+ {0x8009, 203},
+ {0x8017, 203},
+ {0xc028, 203},
+ {0x8002, 204},
+ {0x8009, 204},
+ {0x8017, 204},
+ {0xc028, 204},
},
/* 206 */
{
- {3, 0x02, 203},
- {6, 0x02, 203},
- {10, 0x02, 203},
- {15, 0x02, 203},
- {24, 0x02, 203},
- {31, 0x02, 203},
- {41, 0x02, 203},
- {56, 0x03, 203},
- {3, 0x02, 204},
- {6, 0x02, 204},
- {10, 0x02, 204},
- {15, 0x02, 204},
- {24, 0x02, 204},
- {31, 0x02, 204},
- {41, 0x02, 204},
- {56, 0x03, 204},
+ {0x8003, 203},
+ {0x8006, 203},
+ {0x800a, 203},
+ {0x800f, 203},
+ {0x8018, 203},
+ {0x801f, 203},
+ {0x8029, 203},
+ {0xc038, 203},
+ {0x8003, 204},
+ {0x8006, 204},
+ {0x800a, 204},
+ {0x800f, 204},
+ {0x8018, 204},
+ {0x801f, 204},
+ {0x8029, 204},
+ {0xc038, 204},
},
/* 207 */
{
- {211, 0x00, 0},
- {212, 0x00, 0},
- {214, 0x00, 0},
- {215, 0x00, 0},
- {218, 0x00, 0},
- {219, 0x00, 0},
- {221, 0x00, 0},
- {222, 0x00, 0},
- {226, 0x00, 0},
- {228, 0x00, 0},
- {232, 0x00, 0},
- {235, 0x00, 0},
- {240, 0x00, 0},
- {243, 0x00, 0},
- {247, 0x00, 0},
- {250, 0x00, 0},
+ {0xd3, 0},
+ {0xd4, 0},
+ {0xd6, 0},
+ {0xd7, 0},
+ {0xda, 0},
+ {0xdb, 0},
+ {0xdd, 0},
+ {0xde, 0},
+ {0xe2, 0},
+ {0xe4, 0},
+ {0xe8, 0},
+ {0xeb, 0},
+ {0xf0, 0},
+ {0xf3, 0},
+ {0xf7, 0},
+ {0xfa, 0},
},
/* 208 */
{
- {0, 0x03, 211},
- {0, 0x03, 212},
- {0, 0x03, 214},
- {0, 0x03, 221},
- {0, 0x03, 222},
- {0, 0x03, 223},
- {0, 0x03, 241},
- {0, 0x03, 244},
- {0, 0x03, 245},
- {0, 0x03, 246},
- {0, 0x03, 247},
- {0, 0x03, 248},
- {0, 0x03, 250},
- {0, 0x03, 251},
- {0, 0x03, 252},
- {0, 0x03, 253},
+ {0xc000, 211},
+ {0xc000, 212},
+ {0xc000, 214},
+ {0xc000, 221},
+ {0xc000, 222},
+ {0xc000, 223},
+ {0xc000, 241},
+ {0xc000, 244},
+ {0xc000, 245},
+ {0xc000, 246},
+ {0xc000, 247},
+ {0xc000, 248},
+ {0xc000, 250},
+ {0xc000, 251},
+ {0xc000, 252},
+ {0xc000, 253},
},
/* 209 */
{
- {1, 0x02, 211},
- {22, 0x03, 211},
- {1, 0x02, 212},
- {22, 0x03, 212},
- {1, 0x02, 214},
- {22, 0x03, 214},
- {1, 0x02, 221},
- {22, 0x03, 221},
- {1, 0x02, 222},
- {22, 0x03, 222},
- {1, 0x02, 223},
- {22, 0x03, 223},
- {1, 0x02, 241},
- {22, 0x03, 241},
- {1, 0x02, 244},
- {22, 0x03, 244},
+ {0x8001, 211},
+ {0xc016, 211},
+ {0x8001, 212},
+ {0xc016, 212},
+ {0x8001, 214},
+ {0xc016, 214},
+ {0x8001, 221},
+ {0xc016, 221},
+ {0x8001, 222},
+ {0xc016, 222},
+ {0x8001, 223},
+ {0xc016, 223},
+ {0x8001, 241},
+ {0xc016, 241},
+ {0x8001, 244},
+ {0xc016, 244},
},
/* 210 */
{
- {2, 0x02, 211},
- {9, 0x02, 211},
- {23, 0x02, 211},
- {40, 0x03, 211},
- {2, 0x02, 212},
- {9, 0x02, 212},
- {23, 0x02, 212},
- {40, 0x03, 212},
- {2, 0x02, 214},
- {9, 0x02, 214},
- {23, 0x02, 214},
- {40, 0x03, 214},
- {2, 0x02, 221},
- {9, 0x02, 221},
- {23, 0x02, 221},
- {40, 0x03, 221},
+ {0x8002, 211},
+ {0x8009, 211},
+ {0x8017, 211},
+ {0xc028, 211},
+ {0x8002, 212},
+ {0x8009, 212},
+ {0x8017, 212},
+ {0xc028, 212},
+ {0x8002, 214},
+ {0x8009, 214},
+ {0x8017, 214},
+ {0xc028, 214},
+ {0x8002, 221},
+ {0x8009, 221},
+ {0x8017, 221},
+ {0xc028, 221},
},
/* 211 */
{
- {3, 0x02, 211},
- {6, 0x02, 211},
- {10, 0x02, 211},
- {15, 0x02, 211},
- {24, 0x02, 211},
- {31, 0x02, 211},
- {41, 0x02, 211},
- {56, 0x03, 211},
- {3, 0x02, 212},
- {6, 0x02, 212},
- {10, 0x02, 212},
- {15, 0x02, 212},
- {24, 0x02, 212},
- {31, 0x02, 212},
- {41, 0x02, 212},
- {56, 0x03, 212},
+ {0x8003, 211},
+ {0x8006, 211},
+ {0x800a, 211},
+ {0x800f, 211},
+ {0x8018, 211},
+ {0x801f, 211},
+ {0x8029, 211},
+ {0xc038, 211},
+ {0x8003, 212},
+ {0x8006, 212},
+ {0x800a, 212},
+ {0x800f, 212},
+ {0x8018, 212},
+ {0x801f, 212},
+ {0x8029, 212},
+ {0xc038, 212},
},
/* 212 */
{
- {3, 0x02, 214},
- {6, 0x02, 214},
- {10, 0x02, 214},
- {15, 0x02, 214},
- {24, 0x02, 214},
- {31, 0x02, 214},
- {41, 0x02, 214},
- {56, 0x03, 214},
- {3, 0x02, 221},
- {6, 0x02, 221},
- {10, 0x02, 221},
- {15, 0x02, 221},
- {24, 0x02, 221},
- {31, 0x02, 221},
- {41, 0x02, 221},
- {56, 0x03, 221},
+ {0x8003, 214},
+ {0x8006, 214},
+ {0x800a, 214},
+ {0x800f, 214},
+ {0x8018, 214},
+ {0x801f, 214},
+ {0x8029, 214},
+ {0xc038, 214},
+ {0x8003, 221},
+ {0x8006, 221},
+ {0x800a, 221},
+ {0x800f, 221},
+ {0x8018, 221},
+ {0x801f, 221},
+ {0x8029, 221},
+ {0xc038, 221},
},
/* 213 */
{
- {2, 0x02, 222},
- {9, 0x02, 222},
- {23, 0x02, 222},
- {40, 0x03, 222},
- {2, 0x02, 223},
- {9, 0x02, 223},
- {23, 0x02, 223},
- {40, 0x03, 223},
- {2, 0x02, 241},
- {9, 0x02, 241},
- {23, 0x02, 241},
- {40, 0x03, 241},
- {2, 0x02, 244},
- {9, 0x02, 244},
- {23, 0x02, 244},
- {40, 0x03, 244},
+ {0x8002, 222},
+ {0x8009, 222},
+ {0x8017, 222},
+ {0xc028, 222},
+ {0x8002, 223},
+ {0x8009, 223},
+ {0x8017, 223},
+ {0xc028, 223},
+ {0x8002, 241},
+ {0x8009, 241},
+ {0x8017, 241},
+ {0xc028, 241},
+ {0x8002, 244},
+ {0x8009, 244},
+ {0x8017, 244},
+ {0xc028, 244},
},
/* 214 */
{
- {3, 0x02, 222},
- {6, 0x02, 222},
- {10, 0x02, 222},
- {15, 0x02, 222},
- {24, 0x02, 222},
- {31, 0x02, 222},
- {41, 0x02, 222},
- {56, 0x03, 222},
- {3, 0x02, 223},
- {6, 0x02, 223},
- {10, 0x02, 223},
- {15, 0x02, 223},
- {24, 0x02, 223},
- {31, 0x02, 223},
- {41, 0x02, 223},
- {56, 0x03, 223},
+ {0x8003, 222},
+ {0x8006, 222},
+ {0x800a, 222},
+ {0x800f, 222},
+ {0x8018, 222},
+ {0x801f, 222},
+ {0x8029, 222},
+ {0xc038, 222},
+ {0x8003, 223},
+ {0x8006, 223},
+ {0x800a, 223},
+ {0x800f, 223},
+ {0x8018, 223},
+ {0x801f, 223},
+ {0x8029, 223},
+ {0xc038, 223},
},
/* 215 */
{
- {3, 0x02, 241},
- {6, 0x02, 241},
- {10, 0x02, 241},
- {15, 0x02, 241},
- {24, 0x02, 241},
- {31, 0x02, 241},
- {41, 0x02, 241},
- {56, 0x03, 241},
- {3, 0x02, 244},
- {6, 0x02, 244},
- {10, 0x02, 244},
- {15, 0x02, 244},
- {24, 0x02, 244},
- {31, 0x02, 244},
- {41, 0x02, 244},
- {56, 0x03, 244},
+ {0x8003, 241},
+ {0x8006, 241},
+ {0x800a, 241},
+ {0x800f, 241},
+ {0x8018, 241},
+ {0x801f, 241},
+ {0x8029, 241},
+ {0xc038, 241},
+ {0x8003, 244},
+ {0x8006, 244},
+ {0x800a, 244},
+ {0x800f, 244},
+ {0x8018, 244},
+ {0x801f, 244},
+ {0x8029, 244},
+ {0xc038, 244},
},
/* 216 */
{
- {1, 0x02, 245},
- {22, 0x03, 245},
- {1, 0x02, 246},
- {22, 0x03, 246},
- {1, 0x02, 247},
- {22, 0x03, 247},
- {1, 0x02, 248},
- {22, 0x03, 248},
- {1, 0x02, 250},
- {22, 0x03, 250},
- {1, 0x02, 251},
- {22, 0x03, 251},
- {1, 0x02, 252},
- {22, 0x03, 252},
- {1, 0x02, 253},
- {22, 0x03, 253},
+ {0x8001, 245},
+ {0xc016, 245},
+ {0x8001, 246},
+ {0xc016, 246},
+ {0x8001, 247},
+ {0xc016, 247},
+ {0x8001, 248},
+ {0xc016, 248},
+ {0x8001, 250},
+ {0xc016, 250},
+ {0x8001, 251},
+ {0xc016, 251},
+ {0x8001, 252},
+ {0xc016, 252},
+ {0x8001, 253},
+ {0xc016, 253},
},
/* 217 */
{
- {2, 0x02, 245},
- {9, 0x02, 245},
- {23, 0x02, 245},
- {40, 0x03, 245},
- {2, 0x02, 246},
- {9, 0x02, 246},
- {23, 0x02, 246},
- {40, 0x03, 246},
- {2, 0x02, 247},
- {9, 0x02, 247},
- {23, 0x02, 247},
- {40, 0x03, 247},
- {2, 0x02, 248},
- {9, 0x02, 248},
- {23, 0x02, 248},
- {40, 0x03, 248},
+ {0x8002, 245},
+ {0x8009, 245},
+ {0x8017, 245},
+ {0xc028, 245},
+ {0x8002, 246},
+ {0x8009, 246},
+ {0x8017, 246},
+ {0xc028, 246},
+ {0x8002, 247},
+ {0x8009, 247},
+ {0x8017, 247},
+ {0xc028, 247},
+ {0x8002, 248},
+ {0x8009, 248},
+ {0x8017, 248},
+ {0xc028, 248},
},
/* 218 */
{
- {3, 0x02, 245},
- {6, 0x02, 245},
- {10, 0x02, 245},
- {15, 0x02, 245},
- {24, 0x02, 245},
- {31, 0x02, 245},
- {41, 0x02, 245},
- {56, 0x03, 245},
- {3, 0x02, 246},
- {6, 0x02, 246},
- {10, 0x02, 246},
- {15, 0x02, 246},
- {24, 0x02, 246},
- {31, 0x02, 246},
- {41, 0x02, 246},
- {56, 0x03, 246},
+ {0x8003, 245},
+ {0x8006, 245},
+ {0x800a, 245},
+ {0x800f, 245},
+ {0x8018, 245},
+ {0x801f, 245},
+ {0x8029, 245},
+ {0xc038, 245},
+ {0x8003, 246},
+ {0x8006, 246},
+ {0x800a, 246},
+ {0x800f, 246},
+ {0x8018, 246},
+ {0x801f, 246},
+ {0x8029, 246},
+ {0xc038, 246},
},
/* 219 */
{
- {3, 0x02, 247},
- {6, 0x02, 247},
- {10, 0x02, 247},
- {15, 0x02, 247},
- {24, 0x02, 247},
- {31, 0x02, 247},
- {41, 0x02, 247},
- {56, 0x03, 247},
- {3, 0x02, 248},
- {6, 0x02, 248},
- {10, 0x02, 248},
- {15, 0x02, 248},
- {24, 0x02, 248},
- {31, 0x02, 248},
- {41, 0x02, 248},
- {56, 0x03, 248},
+ {0x8003, 247},
+ {0x8006, 247},
+ {0x800a, 247},
+ {0x800f, 247},
+ {0x8018, 247},
+ {0x801f, 247},
+ {0x8029, 247},
+ {0xc038, 247},
+ {0x8003, 248},
+ {0x8006, 248},
+ {0x800a, 248},
+ {0x800f, 248},
+ {0x8018, 248},
+ {0x801f, 248},
+ {0x8029, 248},
+ {0xc038, 248},
},
/* 220 */
{
- {2, 0x02, 250},
- {9, 0x02, 250},
- {23, 0x02, 250},
- {40, 0x03, 250},
- {2, 0x02, 251},
- {9, 0x02, 251},
- {23, 0x02, 251},
- {40, 0x03, 251},
- {2, 0x02, 252},
- {9, 0x02, 252},
- {23, 0x02, 252},
- {40, 0x03, 252},
- {2, 0x02, 253},
- {9, 0x02, 253},
- {23, 0x02, 253},
- {40, 0x03, 253},
+ {0x8002, 250},
+ {0x8009, 250},
+ {0x8017, 250},
+ {0xc028, 250},
+ {0x8002, 251},
+ {0x8009, 251},
+ {0x8017, 251},
+ {0xc028, 251},
+ {0x8002, 252},
+ {0x8009, 252},
+ {0x8017, 252},
+ {0xc028, 252},
+ {0x8002, 253},
+ {0x8009, 253},
+ {0x8017, 253},
+ {0xc028, 253},
},
/* 221 */
{
- {3, 0x02, 250},
- {6, 0x02, 250},
- {10, 0x02, 250},
- {15, 0x02, 250},
- {24, 0x02, 250},
- {31, 0x02, 250},
- {41, 0x02, 250},
- {56, 0x03, 250},
- {3, 0x02, 251},
- {6, 0x02, 251},
- {10, 0x02, 251},
- {15, 0x02, 251},
- {24, 0x02, 251},
- {31, 0x02, 251},
- {41, 0x02, 251},
- {56, 0x03, 251},
+ {0x8003, 250},
+ {0x8006, 250},
+ {0x800a, 250},
+ {0x800f, 250},
+ {0x8018, 250},
+ {0x801f, 250},
+ {0x8029, 250},
+ {0xc038, 250},
+ {0x8003, 251},
+ {0x8006, 251},
+ {0x800a, 251},
+ {0x800f, 251},
+ {0x8018, 251},
+ {0x801f, 251},
+ {0x8029, 251},
+ {0xc038, 251},
},
/* 222 */
{
- {3, 0x02, 252},
- {6, 0x02, 252},
- {10, 0x02, 252},
- {15, 0x02, 252},
- {24, 0x02, 252},
- {31, 0x02, 252},
- {41, 0x02, 252},
- {56, 0x03, 252},
- {3, 0x02, 253},
- {6, 0x02, 253},
- {10, 0x02, 253},
- {15, 0x02, 253},
- {24, 0x02, 253},
- {31, 0x02, 253},
- {41, 0x02, 253},
- {56, 0x03, 253},
+ {0x8003, 252},
+ {0x8006, 252},
+ {0x800a, 252},
+ {0x800f, 252},
+ {0x8018, 252},
+ {0x801f, 252},
+ {0x8029, 252},
+ {0xc038, 252},
+ {0x8003, 253},
+ {0x8006, 253},
+ {0x800a, 253},
+ {0x800f, 253},
+ {0x8018, 253},
+ {0x801f, 253},
+ {0x8029, 253},
+ {0xc038, 253},
},
/* 223 */
{
- {0, 0x03, 254},
- {227, 0x00, 0},
- {229, 0x00, 0},
- {230, 0x00, 0},
- {233, 0x00, 0},
- {234, 0x00, 0},
- {236, 0x00, 0},
- {237, 0x00, 0},
- {241, 0x00, 0},
- {242, 0x00, 0},
- {244, 0x00, 0},
- {245, 0x00, 0},
- {248, 0x00, 0},
- {249, 0x00, 0},
- {251, 0x00, 0},
- {252, 0x00, 0},
+ {0xc000, 254},
+ {0xe3, 0},
+ {0xe5, 0},
+ {0xe6, 0},
+ {0xe9, 0},
+ {0xea, 0},
+ {0xec, 0},
+ {0xed, 0},
+ {0xf1, 0},
+ {0xf2, 0},
+ {0xf4, 0},
+ {0xf5, 0},
+ {0xf8, 0},
+ {0xf9, 0},
+ {0xfb, 0},
+ {0xfc, 0},
},
/* 224 */
{
- {1, 0x02, 254},
- {22, 0x03, 254},
- {0, 0x03, 2},
- {0, 0x03, 3},
- {0, 0x03, 4},
- {0, 0x03, 5},
- {0, 0x03, 6},
- {0, 0x03, 7},
- {0, 0x03, 8},
- {0, 0x03, 11},
- {0, 0x03, 12},
- {0, 0x03, 14},
- {0, 0x03, 15},
- {0, 0x03, 16},
- {0, 0x03, 17},
- {0, 0x03, 18},
+ {0x8001, 254},
+ {0xc016, 254},
+ {0xc000, 2},
+ {0xc000, 3},
+ {0xc000, 4},
+ {0xc000, 5},
+ {0xc000, 6},
+ {0xc000, 7},
+ {0xc000, 8},
+ {0xc000, 11},
+ {0xc000, 12},
+ {0xc000, 14},
+ {0xc000, 15},
+ {0xc000, 16},
+ {0xc000, 17},
+ {0xc000, 18},
},
/* 225 */
{
- {2, 0x02, 254},
- {9, 0x02, 254},
- {23, 0x02, 254},
- {40, 0x03, 254},
- {1, 0x02, 2},
- {22, 0x03, 2},
- {1, 0x02, 3},
- {22, 0x03, 3},
- {1, 0x02, 4},
- {22, 0x03, 4},
- {1, 0x02, 5},
- {22, 0x03, 5},
- {1, 0x02, 6},
- {22, 0x03, 6},
- {1, 0x02, 7},
- {22, 0x03, 7},
+ {0x8002, 254},
+ {0x8009, 254},
+ {0x8017, 254},
+ {0xc028, 254},
+ {0x8001, 2},
+ {0xc016, 2},
+ {0x8001, 3},
+ {0xc016, 3},
+ {0x8001, 4},
+ {0xc016, 4},
+ {0x8001, 5},
+ {0xc016, 5},
+ {0x8001, 6},
+ {0xc016, 6},
+ {0x8001, 7},
+ {0xc016, 7},
},
/* 226 */
{
- {3, 0x02, 254},
- {6, 0x02, 254},
- {10, 0x02, 254},
- {15, 0x02, 254},
- {24, 0x02, 254},
- {31, 0x02, 254},
- {41, 0x02, 254},
- {56, 0x03, 254},
- {2, 0x02, 2},
- {9, 0x02, 2},
- {23, 0x02, 2},
- {40, 0x03, 2},
- {2, 0x02, 3},
- {9, 0x02, 3},
- {23, 0x02, 3},
- {40, 0x03, 3},
+ {0x8003, 254},
+ {0x8006, 254},
+ {0x800a, 254},
+ {0x800f, 254},
+ {0x8018, 254},
+ {0x801f, 254},
+ {0x8029, 254},
+ {0xc038, 254},
+ {0x8002, 2},
+ {0x8009, 2},
+ {0x8017, 2},
+ {0xc028, 2},
+ {0x8002, 3},
+ {0x8009, 3},
+ {0x8017, 3},
+ {0xc028, 3},
},
/* 227 */
{
- {3, 0x02, 2},
- {6, 0x02, 2},
- {10, 0x02, 2},
- {15, 0x02, 2},
- {24, 0x02, 2},
- {31, 0x02, 2},
- {41, 0x02, 2},
- {56, 0x03, 2},
- {3, 0x02, 3},
- {6, 0x02, 3},
- {10, 0x02, 3},
- {15, 0x02, 3},
- {24, 0x02, 3},
- {31, 0x02, 3},
- {41, 0x02, 3},
- {56, 0x03, 3},
+ {0x8003, 2},
+ {0x8006, 2},
+ {0x800a, 2},
+ {0x800f, 2},
+ {0x8018, 2},
+ {0x801f, 2},
+ {0x8029, 2},
+ {0xc038, 2},
+ {0x8003, 3},
+ {0x8006, 3},
+ {0x800a, 3},
+ {0x800f, 3},
+ {0x8018, 3},
+ {0x801f, 3},
+ {0x8029, 3},
+ {0xc038, 3},
},
/* 228 */
{
- {2, 0x02, 4},
- {9, 0x02, 4},
- {23, 0x02, 4},
- {40, 0x03, 4},
- {2, 0x02, 5},
- {9, 0x02, 5},
- {23, 0x02, 5},
- {40, 0x03, 5},
- {2, 0x02, 6},
- {9, 0x02, 6},
- {23, 0x02, 6},
- {40, 0x03, 6},
- {2, 0x02, 7},
- {9, 0x02, 7},
- {23, 0x02, 7},
- {40, 0x03, 7},
+ {0x8002, 4},
+ {0x8009, 4},
+ {0x8017, 4},
+ {0xc028, 4},
+ {0x8002, 5},
+ {0x8009, 5},
+ {0x8017, 5},
+ {0xc028, 5},
+ {0x8002, 6},
+ {0x8009, 6},
+ {0x8017, 6},
+ {0xc028, 6},
+ {0x8002, 7},
+ {0x8009, 7},
+ {0x8017, 7},
+ {0xc028, 7},
},
/* 229 */
{
- {3, 0x02, 4},
- {6, 0x02, 4},
- {10, 0x02, 4},
- {15, 0x02, 4},
- {24, 0x02, 4},
- {31, 0x02, 4},
- {41, 0x02, 4},
- {56, 0x03, 4},
- {3, 0x02, 5},
- {6, 0x02, 5},
- {10, 0x02, 5},
- {15, 0x02, 5},
- {24, 0x02, 5},
- {31, 0x02, 5},
- {41, 0x02, 5},
- {56, 0x03, 5},
+ {0x8003, 4},
+ {0x8006, 4},
+ {0x800a, 4},
+ {0x800f, 4},
+ {0x8018, 4},
+ {0x801f, 4},
+ {0x8029, 4},
+ {0xc038, 4},
+ {0x8003, 5},
+ {0x8006, 5},
+ {0x800a, 5},
+ {0x800f, 5},
+ {0x8018, 5},
+ {0x801f, 5},
+ {0x8029, 5},
+ {0xc038, 5},
},
/* 230 */
{
- {3, 0x02, 6},
- {6, 0x02, 6},
- {10, 0x02, 6},
- {15, 0x02, 6},
- {24, 0x02, 6},
- {31, 0x02, 6},
- {41, 0x02, 6},
- {56, 0x03, 6},
- {3, 0x02, 7},
- {6, 0x02, 7},
- {10, 0x02, 7},
- {15, 0x02, 7},
- {24, 0x02, 7},
- {31, 0x02, 7},
- {41, 0x02, 7},
- {56, 0x03, 7},
+ {0x8003, 6},
+ {0x8006, 6},
+ {0x800a, 6},
+ {0x800f, 6},
+ {0x8018, 6},
+ {0x801f, 6},
+ {0x8029, 6},
+ {0xc038, 6},
+ {0x8003, 7},
+ {0x8006, 7},
+ {0x800a, 7},
+ {0x800f, 7},
+ {0x8018, 7},
+ {0x801f, 7},
+ {0x8029, 7},
+ {0xc038, 7},
},
/* 231 */
{
- {1, 0x02, 8},
- {22, 0x03, 8},
- {1, 0x02, 11},
- {22, 0x03, 11},
- {1, 0x02, 12},
- {22, 0x03, 12},
- {1, 0x02, 14},
- {22, 0x03, 14},
- {1, 0x02, 15},
- {22, 0x03, 15},
- {1, 0x02, 16},
- {22, 0x03, 16},
- {1, 0x02, 17},
- {22, 0x03, 17},
- {1, 0x02, 18},
- {22, 0x03, 18},
+ {0x8001, 8},
+ {0xc016, 8},
+ {0x8001, 11},
+ {0xc016, 11},
+ {0x8001, 12},
+ {0xc016, 12},
+ {0x8001, 14},
+ {0xc016, 14},
+ {0x8001, 15},
+ {0xc016, 15},
+ {0x8001, 16},
+ {0xc016, 16},
+ {0x8001, 17},
+ {0xc016, 17},
+ {0x8001, 18},
+ {0xc016, 18},
},
/* 232 */
{
- {2, 0x02, 8},
- {9, 0x02, 8},
- {23, 0x02, 8},
- {40, 0x03, 8},
- {2, 0x02, 11},
- {9, 0x02, 11},
- {23, 0x02, 11},
- {40, 0x03, 11},
- {2, 0x02, 12},
- {9, 0x02, 12},
- {23, 0x02, 12},
- {40, 0x03, 12},
- {2, 0x02, 14},
- {9, 0x02, 14},
- {23, 0x02, 14},
- {40, 0x03, 14},
+ {0x8002, 8},
+ {0x8009, 8},
+ {0x8017, 8},
+ {0xc028, 8},
+ {0x8002, 11},
+ {0x8009, 11},
+ {0x8017, 11},
+ {0xc028, 11},
+ {0x8002, 12},
+ {0x8009, 12},
+ {0x8017, 12},
+ {0xc028, 12},
+ {0x8002, 14},
+ {0x8009, 14},
+ {0x8017, 14},
+ {0xc028, 14},
},
/* 233 */
{
- {3, 0x02, 8},
- {6, 0x02, 8},
- {10, 0x02, 8},
- {15, 0x02, 8},
- {24, 0x02, 8},
- {31, 0x02, 8},
- {41, 0x02, 8},
- {56, 0x03, 8},
- {3, 0x02, 11},
- {6, 0x02, 11},
- {10, 0x02, 11},
- {15, 0x02, 11},
- {24, 0x02, 11},
- {31, 0x02, 11},
- {41, 0x02, 11},
- {56, 0x03, 11},
+ {0x8003, 8},
+ {0x8006, 8},
+ {0x800a, 8},
+ {0x800f, 8},
+ {0x8018, 8},
+ {0x801f, 8},
+ {0x8029, 8},
+ {0xc038, 8},
+ {0x8003, 11},
+ {0x8006, 11},
+ {0x800a, 11},
+ {0x800f, 11},
+ {0x8018, 11},
+ {0x801f, 11},
+ {0x8029, 11},
+ {0xc038, 11},
},
/* 234 */
{
- {3, 0x02, 12},
- {6, 0x02, 12},
- {10, 0x02, 12},
- {15, 0x02, 12},
- {24, 0x02, 12},
- {31, 0x02, 12},
- {41, 0x02, 12},
- {56, 0x03, 12},
- {3, 0x02, 14},
- {6, 0x02, 14},
- {10, 0x02, 14},
- {15, 0x02, 14},
- {24, 0x02, 14},
- {31, 0x02, 14},
- {41, 0x02, 14},
- {56, 0x03, 14},
+ {0x8003, 12},
+ {0x8006, 12},
+ {0x800a, 12},
+ {0x800f, 12},
+ {0x8018, 12},
+ {0x801f, 12},
+ {0x8029, 12},
+ {0xc038, 12},
+ {0x8003, 14},
+ {0x8006, 14},
+ {0x800a, 14},
+ {0x800f, 14},
+ {0x8018, 14},
+ {0x801f, 14},
+ {0x8029, 14},
+ {0xc038, 14},
},
/* 235 */
{
- {2, 0x02, 15},
- {9, 0x02, 15},
- {23, 0x02, 15},
- {40, 0x03, 15},
- {2, 0x02, 16},
- {9, 0x02, 16},
- {23, 0x02, 16},
- {40, 0x03, 16},
- {2, 0x02, 17},
- {9, 0x02, 17},
- {23, 0x02, 17},
- {40, 0x03, 17},
- {2, 0x02, 18},
- {9, 0x02, 18},
- {23, 0x02, 18},
- {40, 0x03, 18},
+ {0x8002, 15},
+ {0x8009, 15},
+ {0x8017, 15},
+ {0xc028, 15},
+ {0x8002, 16},
+ {0x8009, 16},
+ {0x8017, 16},
+ {0xc028, 16},
+ {0x8002, 17},
+ {0x8009, 17},
+ {0x8017, 17},
+ {0xc028, 17},
+ {0x8002, 18},
+ {0x8009, 18},
+ {0x8017, 18},
+ {0xc028, 18},
},
/* 236 */
{
- {3, 0x02, 15},
- {6, 0x02, 15},
- {10, 0x02, 15},
- {15, 0x02, 15},
- {24, 0x02, 15},
- {31, 0x02, 15},
- {41, 0x02, 15},
- {56, 0x03, 15},
- {3, 0x02, 16},
- {6, 0x02, 16},
- {10, 0x02, 16},
- {15, 0x02, 16},
- {24, 0x02, 16},
- {31, 0x02, 16},
- {41, 0x02, 16},
- {56, 0x03, 16},
+ {0x8003, 15},
+ {0x8006, 15},
+ {0x800a, 15},
+ {0x800f, 15},
+ {0x8018, 15},
+ {0x801f, 15},
+ {0x8029, 15},
+ {0xc038, 15},
+ {0x8003, 16},
+ {0x8006, 16},
+ {0x800a, 16},
+ {0x800f, 16},
+ {0x8018, 16},
+ {0x801f, 16},
+ {0x8029, 16},
+ {0xc038, 16},
},
/* 237 */
{
- {3, 0x02, 17},
- {6, 0x02, 17},
- {10, 0x02, 17},
- {15, 0x02, 17},
- {24, 0x02, 17},
- {31, 0x02, 17},
- {41, 0x02, 17},
- {56, 0x03, 17},
- {3, 0x02, 18},
- {6, 0x02, 18},
- {10, 0x02, 18},
- {15, 0x02, 18},
- {24, 0x02, 18},
- {31, 0x02, 18},
- {41, 0x02, 18},
- {56, 0x03, 18},
+ {0x8003, 17},
+ {0x8006, 17},
+ {0x800a, 17},
+ {0x800f, 17},
+ {0x8018, 17},
+ {0x801f, 17},
+ {0x8029, 17},
+ {0xc038, 17},
+ {0x8003, 18},
+ {0x8006, 18},
+ {0x800a, 18},
+ {0x800f, 18},
+ {0x8018, 18},
+ {0x801f, 18},
+ {0x8029, 18},
+ {0xc038, 18},
},
/* 238 */
{
- {0, 0x03, 19},
- {0, 0x03, 20},
- {0, 0x03, 21},
- {0, 0x03, 23},
- {0, 0x03, 24},
- {0, 0x03, 25},
- {0, 0x03, 26},
- {0, 0x03, 27},
- {0, 0x03, 28},
- {0, 0x03, 29},
- {0, 0x03, 30},
- {0, 0x03, 31},
- {0, 0x03, 127},
- {0, 0x03, 220},
- {0, 0x03, 249},
- {253, 0x00, 0},
+ {0xc000, 19},
+ {0xc000, 20},
+ {0xc000, 21},
+ {0xc000, 23},
+ {0xc000, 24},
+ {0xc000, 25},
+ {0xc000, 26},
+ {0xc000, 27},
+ {0xc000, 28},
+ {0xc000, 29},
+ {0xc000, 30},
+ {0xc000, 31},
+ {0xc000, 127},
+ {0xc000, 220},
+ {0xc000, 249},
+ {0xfd, 0},
},
/* 239 */
{
- {1, 0x02, 19},
- {22, 0x03, 19},
- {1, 0x02, 20},
- {22, 0x03, 20},
- {1, 0x02, 21},
- {22, 0x03, 21},
- {1, 0x02, 23},
- {22, 0x03, 23},
- {1, 0x02, 24},
- {22, 0x03, 24},
- {1, 0x02, 25},
- {22, 0x03, 25},
- {1, 0x02, 26},
- {22, 0x03, 26},
- {1, 0x02, 27},
- {22, 0x03, 27},
+ {0x8001, 19},
+ {0xc016, 19},
+ {0x8001, 20},
+ {0xc016, 20},
+ {0x8001, 21},
+ {0xc016, 21},
+ {0x8001, 23},
+ {0xc016, 23},
+ {0x8001, 24},
+ {0xc016, 24},
+ {0x8001, 25},
+ {0xc016, 25},
+ {0x8001, 26},
+ {0xc016, 26},
+ {0x8001, 27},
+ {0xc016, 27},
},
/* 240 */
{
- {2, 0x02, 19},
- {9, 0x02, 19},
- {23, 0x02, 19},
- {40, 0x03, 19},
- {2, 0x02, 20},
- {9, 0x02, 20},
- {23, 0x02, 20},
- {40, 0x03, 20},
- {2, 0x02, 21},
- {9, 0x02, 21},
- {23, 0x02, 21},
- {40, 0x03, 21},
- {2, 0x02, 23},
- {9, 0x02, 23},
- {23, 0x02, 23},
- {40, 0x03, 23},
+ {0x8002, 19},
+ {0x8009, 19},
+ {0x8017, 19},
+ {0xc028, 19},
+ {0x8002, 20},
+ {0x8009, 20},
+ {0x8017, 20},
+ {0xc028, 20},
+ {0x8002, 21},
+ {0x8009, 21},
+ {0x8017, 21},
+ {0xc028, 21},
+ {0x8002, 23},
+ {0x8009, 23},
+ {0x8017, 23},
+ {0xc028, 23},
},
/* 241 */
{
- {3, 0x02, 19},
- {6, 0x02, 19},
- {10, 0x02, 19},
- {15, 0x02, 19},
- {24, 0x02, 19},
- {31, 0x02, 19},
- {41, 0x02, 19},
- {56, 0x03, 19},
- {3, 0x02, 20},
- {6, 0x02, 20},
- {10, 0x02, 20},
- {15, 0x02, 20},
- {24, 0x02, 20},
- {31, 0x02, 20},
- {41, 0x02, 20},
- {56, 0x03, 20},
+ {0x8003, 19},
+ {0x8006, 19},
+ {0x800a, 19},
+ {0x800f, 19},
+ {0x8018, 19},
+ {0x801f, 19},
+ {0x8029, 19},
+ {0xc038, 19},
+ {0x8003, 20},
+ {0x8006, 20},
+ {0x800a, 20},
+ {0x800f, 20},
+ {0x8018, 20},
+ {0x801f, 20},
+ {0x8029, 20},
+ {0xc038, 20},
},
/* 242 */
{
- {3, 0x02, 21},
- {6, 0x02, 21},
- {10, 0x02, 21},
- {15, 0x02, 21},
- {24, 0x02, 21},
- {31, 0x02, 21},
- {41, 0x02, 21},
- {56, 0x03, 21},
- {3, 0x02, 23},
- {6, 0x02, 23},
- {10, 0x02, 23},
- {15, 0x02, 23},
- {24, 0x02, 23},
- {31, 0x02, 23},
- {41, 0x02, 23},
- {56, 0x03, 23},
+ {0x8003, 21},
+ {0x8006, 21},
+ {0x800a, 21},
+ {0x800f, 21},
+ {0x8018, 21},
+ {0x801f, 21},
+ {0x8029, 21},
+ {0xc038, 21},
+ {0x8003, 23},
+ {0x8006, 23},
+ {0x800a, 23},
+ {0x800f, 23},
+ {0x8018, 23},
+ {0x801f, 23},
+ {0x8029, 23},
+ {0xc038, 23},
},
/* 243 */
{
- {2, 0x02, 24},
- {9, 0x02, 24},
- {23, 0x02, 24},
- {40, 0x03, 24},
- {2, 0x02, 25},
- {9, 0x02, 25},
- {23, 0x02, 25},
- {40, 0x03, 25},
- {2, 0x02, 26},
- {9, 0x02, 26},
- {23, 0x02, 26},
- {40, 0x03, 26},
- {2, 0x02, 27},
- {9, 0x02, 27},
- {23, 0x02, 27},
- {40, 0x03, 27},
+ {0x8002, 24},
+ {0x8009, 24},
+ {0x8017, 24},
+ {0xc028, 24},
+ {0x8002, 25},
+ {0x8009, 25},
+ {0x8017, 25},
+ {0xc028, 25},
+ {0x8002, 26},
+ {0x8009, 26},
+ {0x8017, 26},
+ {0xc028, 26},
+ {0x8002, 27},
+ {0x8009, 27},
+ {0x8017, 27},
+ {0xc028, 27},
},
/* 244 */
{
- {3, 0x02, 24},
- {6, 0x02, 24},
- {10, 0x02, 24},
- {15, 0x02, 24},
- {24, 0x02, 24},
- {31, 0x02, 24},
- {41, 0x02, 24},
- {56, 0x03, 24},
- {3, 0x02, 25},
- {6, 0x02, 25},
- {10, 0x02, 25},
- {15, 0x02, 25},
- {24, 0x02, 25},
- {31, 0x02, 25},
- {41, 0x02, 25},
- {56, 0x03, 25},
+ {0x8003, 24},
+ {0x8006, 24},
+ {0x800a, 24},
+ {0x800f, 24},
+ {0x8018, 24},
+ {0x801f, 24},
+ {0x8029, 24},
+ {0xc038, 24},
+ {0x8003, 25},
+ {0x8006, 25},
+ {0x800a, 25},
+ {0x800f, 25},
+ {0x8018, 25},
+ {0x801f, 25},
+ {0x8029, 25},
+ {0xc038, 25},
},
/* 245 */
{
- {3, 0x02, 26},
- {6, 0x02, 26},
- {10, 0x02, 26},
- {15, 0x02, 26},
- {24, 0x02, 26},
- {31, 0x02, 26},
- {41, 0x02, 26},
- {56, 0x03, 26},
- {3, 0x02, 27},
- {6, 0x02, 27},
- {10, 0x02, 27},
- {15, 0x02, 27},
- {24, 0x02, 27},
- {31, 0x02, 27},
- {41, 0x02, 27},
- {56, 0x03, 27},
+ {0x8003, 26},
+ {0x8006, 26},
+ {0x800a, 26},
+ {0x800f, 26},
+ {0x8018, 26},
+ {0x801f, 26},
+ {0x8029, 26},
+ {0xc038, 26},
+ {0x8003, 27},
+ {0x8006, 27},
+ {0x800a, 27},
+ {0x800f, 27},
+ {0x8018, 27},
+ {0x801f, 27},
+ {0x8029, 27},
+ {0xc038, 27},
},
/* 246 */
{
- {1, 0x02, 28},
- {22, 0x03, 28},
- {1, 0x02, 29},
- {22, 0x03, 29},
- {1, 0x02, 30},
- {22, 0x03, 30},
- {1, 0x02, 31},
- {22, 0x03, 31},
- {1, 0x02, 127},
- {22, 0x03, 127},
- {1, 0x02, 220},
- {22, 0x03, 220},
- {1, 0x02, 249},
- {22, 0x03, 249},
- {254, 0x00, 0},
- {255, 0x00, 0},
+ {0x8001, 28},
+ {0xc016, 28},
+ {0x8001, 29},
+ {0xc016, 29},
+ {0x8001, 30},
+ {0xc016, 30},
+ {0x8001, 31},
+ {0xc016, 31},
+ {0x8001, 127},
+ {0xc016, 127},
+ {0x8001, 220},
+ {0xc016, 220},
+ {0x8001, 249},
+ {0xc016, 249},
+ {0xfe, 0},
+ {0xff, 0},
},
/* 247 */
{
- {2, 0x02, 28},
- {9, 0x02, 28},
- {23, 0x02, 28},
- {40, 0x03, 28},
- {2, 0x02, 29},
- {9, 0x02, 29},
- {23, 0x02, 29},
- {40, 0x03, 29},
- {2, 0x02, 30},
- {9, 0x02, 30},
- {23, 0x02, 30},
- {40, 0x03, 30},
- {2, 0x02, 31},
- {9, 0x02, 31},
- {23, 0x02, 31},
- {40, 0x03, 31},
+ {0x8002, 28},
+ {0x8009, 28},
+ {0x8017, 28},
+ {0xc028, 28},
+ {0x8002, 29},
+ {0x8009, 29},
+ {0x8017, 29},
+ {0xc028, 29},
+ {0x8002, 30},
+ {0x8009, 30},
+ {0x8017, 30},
+ {0xc028, 30},
+ {0x8002, 31},
+ {0x8009, 31},
+ {0x8017, 31},
+ {0xc028, 31},
},
/* 248 */
{
- {3, 0x02, 28},
- {6, 0x02, 28},
- {10, 0x02, 28},
- {15, 0x02, 28},
- {24, 0x02, 28},
- {31, 0x02, 28},
- {41, 0x02, 28},
- {56, 0x03, 28},
- {3, 0x02, 29},
- {6, 0x02, 29},
- {10, 0x02, 29},
- {15, 0x02, 29},
- {24, 0x02, 29},
- {31, 0x02, 29},
- {41, 0x02, 29},
- {56, 0x03, 29},
+ {0x8003, 28},
+ {0x8006, 28},
+ {0x800a, 28},
+ {0x800f, 28},
+ {0x8018, 28},
+ {0x801f, 28},
+ {0x8029, 28},
+ {0xc038, 28},
+ {0x8003, 29},
+ {0x8006, 29},
+ {0x800a, 29},
+ {0x800f, 29},
+ {0x8018, 29},
+ {0x801f, 29},
+ {0x8029, 29},
+ {0xc038, 29},
},
/* 249 */
{
- {3, 0x02, 30},
- {6, 0x02, 30},
- {10, 0x02, 30},
- {15, 0x02, 30},
- {24, 0x02, 30},
- {31, 0x02, 30},
- {41, 0x02, 30},
- {56, 0x03, 30},
- {3, 0x02, 31},
- {6, 0x02, 31},
- {10, 0x02, 31},
- {15, 0x02, 31},
- {24, 0x02, 31},
- {31, 0x02, 31},
- {41, 0x02, 31},
- {56, 0x03, 31},
+ {0x8003, 30},
+ {0x8006, 30},
+ {0x800a, 30},
+ {0x800f, 30},
+ {0x8018, 30},
+ {0x801f, 30},
+ {0x8029, 30},
+ {0xc038, 30},
+ {0x8003, 31},
+ {0x8006, 31},
+ {0x800a, 31},
+ {0x800f, 31},
+ {0x8018, 31},
+ {0x801f, 31},
+ {0x8029, 31},
+ {0xc038, 31},
},
/* 250 */
{
- {2, 0x02, 127},
- {9, 0x02, 127},
- {23, 0x02, 127},
- {40, 0x03, 127},
- {2, 0x02, 220},
- {9, 0x02, 220},
- {23, 0x02, 220},
- {40, 0x03, 220},
- {2, 0x02, 249},
- {9, 0x02, 249},
- {23, 0x02, 249},
- {40, 0x03, 249},
- {0, 0x03, 10},
- {0, 0x03, 13},
- {0, 0x03, 22},
- {0, 0x04, 0},
+ {0x8002, 127},
+ {0x8009, 127},
+ {0x8017, 127},
+ {0xc028, 127},
+ {0x8002, 220},
+ {0x8009, 220},
+ {0x8017, 220},
+ {0xc028, 220},
+ {0x8002, 249},
+ {0x8009, 249},
+ {0x8017, 249},
+ {0xc028, 249},
+ {0xc000, 10},
+ {0xc000, 13},
+ {0xc000, 22},
+ {0x100, 0},
},
/* 251 */
{
- {3, 0x02, 127},
- {6, 0x02, 127},
- {10, 0x02, 127},
- {15, 0x02, 127},
- {24, 0x02, 127},
- {31, 0x02, 127},
- {41, 0x02, 127},
- {56, 0x03, 127},
- {3, 0x02, 220},
- {6, 0x02, 220},
- {10, 0x02, 220},
- {15, 0x02, 220},
- {24, 0x02, 220},
- {31, 0x02, 220},
- {41, 0x02, 220},
- {56, 0x03, 220},
+ {0x8003, 127},
+ {0x8006, 127},
+ {0x800a, 127},
+ {0x800f, 127},
+ {0x8018, 127},
+ {0x801f, 127},
+ {0x8029, 127},
+ {0xc038, 127},
+ {0x8003, 220},
+ {0x8006, 220},
+ {0x800a, 220},
+ {0x800f, 220},
+ {0x8018, 220},
+ {0x801f, 220},
+ {0x8029, 220},
+ {0xc038, 220},
},
/* 252 */
{
- {3, 0x02, 249},
- {6, 0x02, 249},
- {10, 0x02, 249},
- {15, 0x02, 249},
- {24, 0x02, 249},
- {31, 0x02, 249},
- {41, 0x02, 249},
- {56, 0x03, 249},
- {1, 0x02, 10},
- {22, 0x03, 10},
- {1, 0x02, 13},
- {22, 0x03, 13},
- {1, 0x02, 22},
- {22, 0x03, 22},
- {0, 0x04, 0},
- {0, 0x04, 0},
+ {0x8003, 249},
+ {0x8006, 249},
+ {0x800a, 249},
+ {0x800f, 249},
+ {0x8018, 249},
+ {0x801f, 249},
+ {0x8029, 249},
+ {0xc038, 249},
+ {0x8001, 10},
+ {0xc016, 10},
+ {0x8001, 13},
+ {0xc016, 13},
+ {0x8001, 22},
+ {0xc016, 22},
+ {0x100, 0},
+ {0x100, 0},
},
/* 253 */
{
- {2, 0x02, 10},
- {9, 0x02, 10},
- {23, 0x02, 10},
- {40, 0x03, 10},
- {2, 0x02, 13},
- {9, 0x02, 13},
- {23, 0x02, 13},
- {40, 0x03, 13},
- {2, 0x02, 22},
- {9, 0x02, 22},
- {23, 0x02, 22},
- {40, 0x03, 22},
- {0, 0x04, 0},
- {0, 0x04, 0},
- {0, 0x04, 0},
- {0, 0x04, 0},
+ {0x8002, 10},
+ {0x8009, 10},
+ {0x8017, 10},
+ {0xc028, 10},
+ {0x8002, 13},
+ {0x8009, 13},
+ {0x8017, 13},
+ {0xc028, 13},
+ {0x8002, 22},
+ {0x8009, 22},
+ {0x8017, 22},
+ {0xc028, 22},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
},
/* 254 */
{
- {3, 0x02, 10},
- {6, 0x02, 10},
- {10, 0x02, 10},
- {15, 0x02, 10},
- {24, 0x02, 10},
- {31, 0x02, 10},
- {41, 0x02, 10},
- {56, 0x03, 10},
- {3, 0x02, 13},
- {6, 0x02, 13},
- {10, 0x02, 13},
- {15, 0x02, 13},
- {24, 0x02, 13},
- {31, 0x02, 13},
- {41, 0x02, 13},
- {56, 0x03, 13},
+ {0x8003, 10},
+ {0x8006, 10},
+ {0x800a, 10},
+ {0x800f, 10},
+ {0x8018, 10},
+ {0x801f, 10},
+ {0x8029, 10},
+ {0xc038, 10},
+ {0x8003, 13},
+ {0x8006, 13},
+ {0x800a, 13},
+ {0x800f, 13},
+ {0x8018, 13},
+ {0x801f, 13},
+ {0x8029, 13},
+ {0xc038, 13},
},
/* 255 */
{
- {3, 0x02, 22},
- {6, 0x02, 22},
- {10, 0x02, 22},
- {15, 0x02, 22},
- {24, 0x02, 22},
- {31, 0x02, 22},
- {41, 0x02, 22},
- {56, 0x03, 22},
- {0, 0x04, 0},
- {0, 0x04, 0},
- {0, 0x04, 0},
- {0, 0x04, 0},
- {0, 0x04, 0},
- {0, 0x04, 0},
- {0, 0x04, 0},
- {0, 0x04, 0},
+ {0x8003, 22},
+ {0x8006, 22},
+ {0x800a, 22},
+ {0x800f, 22},
+ {0x8018, 22},
+ {0x801f, 22},
+ {0x8029, 22},
+ {0xc038, 22},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ },
+ /* 256 */
+ {
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
+ {0x100, 0},
},
};
diff --git a/deps/nghttp2/lib/nghttp2_helper.c b/deps/nghttp2/lib/nghttp2_helper.c
index 81a8a0cf99971a..91136a61986014 100644
--- a/deps/nghttp2/lib/nghttp2_helper.c
+++ b/deps/nghttp2/lib/nghttp2_helper.c
@@ -505,6 +505,84 @@ int nghttp2_check_header_value(const uint8_t *value, size_t len) {
return 1;
}
+/* Generated by genauthroitychartbl.py */
+static char VALID_AUTHORITY_CHARS[] = {
+ 0 /* NUL */, 0 /* SOH */, 0 /* STX */, 0 /* ETX */,
+ 0 /* EOT */, 0 /* ENQ */, 0 /* ACK */, 0 /* BEL */,
+ 0 /* BS */, 0 /* HT */, 0 /* LF */, 0 /* VT */,
+ 0 /* FF */, 0 /* CR */, 0 /* SO */, 0 /* SI */,
+ 0 /* DLE */, 0 /* DC1 */, 0 /* DC2 */, 0 /* DC3 */,
+ 0 /* DC4 */, 0 /* NAK */, 0 /* SYN */, 0 /* ETB */,
+ 0 /* CAN */, 0 /* EM */, 0 /* SUB */, 0 /* ESC */,
+ 0 /* FS */, 0 /* GS */, 0 /* RS */, 0 /* US */,
+ 0 /* SPC */, 1 /* ! */, 0 /* " */, 0 /* # */,
+ 1 /* $ */, 1 /* % */, 1 /* & */, 1 /* ' */,
+ 1 /* ( */, 1 /* ) */, 1 /* * */, 1 /* + */,
+ 1 /* , */, 1 /* - */, 1 /* . */, 0 /* / */,
+ 1 /* 0 */, 1 /* 1 */, 1 /* 2 */, 1 /* 3 */,
+ 1 /* 4 */, 1 /* 5 */, 1 /* 6 */, 1 /* 7 */,
+ 1 /* 8 */, 1 /* 9 */, 1 /* : */, 1 /* ; */,
+ 0 /* < */, 1 /* = */, 0 /* > */, 0 /* ? */,
+ 1 /* @ */, 1 /* A */, 1 /* B */, 1 /* C */,
+ 1 /* D */, 1 /* E */, 1 /* F */, 1 /* G */,
+ 1 /* H */, 1 /* I */, 1 /* J */, 1 /* K */,
+ 1 /* L */, 1 /* M */, 1 /* N */, 1 /* O */,
+ 1 /* P */, 1 /* Q */, 1 /* R */, 1 /* S */,
+ 1 /* T */, 1 /* U */, 1 /* V */, 1 /* W */,
+ 1 /* X */, 1 /* Y */, 1 /* Z */, 1 /* [ */,
+ 0 /* \ */, 1 /* ] */, 0 /* ^ */, 1 /* _ */,
+ 0 /* ` */, 1 /* a */, 1 /* b */, 1 /* c */,
+ 1 /* d */, 1 /* e */, 1 /* f */, 1 /* g */,
+ 1 /* h */, 1 /* i */, 1 /* j */, 1 /* k */,
+ 1 /* l */, 1 /* m */, 1 /* n */, 1 /* o */,
+ 1 /* p */, 1 /* q */, 1 /* r */, 1 /* s */,
+ 1 /* t */, 1 /* u */, 1 /* v */, 1 /* w */,
+ 1 /* x */, 1 /* y */, 1 /* z */, 0 /* { */,
+ 0 /* | */, 0 /* } */, 1 /* ~ */, 0 /* DEL */,
+ 0 /* 0x80 */, 0 /* 0x81 */, 0 /* 0x82 */, 0 /* 0x83 */,
+ 0 /* 0x84 */, 0 /* 0x85 */, 0 /* 0x86 */, 0 /* 0x87 */,
+ 0 /* 0x88 */, 0 /* 0x89 */, 0 /* 0x8a */, 0 /* 0x8b */,
+ 0 /* 0x8c */, 0 /* 0x8d */, 0 /* 0x8e */, 0 /* 0x8f */,
+ 0 /* 0x90 */, 0 /* 0x91 */, 0 /* 0x92 */, 0 /* 0x93 */,
+ 0 /* 0x94 */, 0 /* 0x95 */, 0 /* 0x96 */, 0 /* 0x97 */,
+ 0 /* 0x98 */, 0 /* 0x99 */, 0 /* 0x9a */, 0 /* 0x9b */,
+ 0 /* 0x9c */, 0 /* 0x9d */, 0 /* 0x9e */, 0 /* 0x9f */,
+ 0 /* 0xa0 */, 0 /* 0xa1 */, 0 /* 0xa2 */, 0 /* 0xa3 */,
+ 0 /* 0xa4 */, 0 /* 0xa5 */, 0 /* 0xa6 */, 0 /* 0xa7 */,
+ 0 /* 0xa8 */, 0 /* 0xa9 */, 0 /* 0xaa */, 0 /* 0xab */,
+ 0 /* 0xac */, 0 /* 0xad */, 0 /* 0xae */, 0 /* 0xaf */,
+ 0 /* 0xb0 */, 0 /* 0xb1 */, 0 /* 0xb2 */, 0 /* 0xb3 */,
+ 0 /* 0xb4 */, 0 /* 0xb5 */, 0 /* 0xb6 */, 0 /* 0xb7 */,
+ 0 /* 0xb8 */, 0 /* 0xb9 */, 0 /* 0xba */, 0 /* 0xbb */,
+ 0 /* 0xbc */, 0 /* 0xbd */, 0 /* 0xbe */, 0 /* 0xbf */,
+ 0 /* 0xc0 */, 0 /* 0xc1 */, 0 /* 0xc2 */, 0 /* 0xc3 */,
+ 0 /* 0xc4 */, 0 /* 0xc5 */, 0 /* 0xc6 */, 0 /* 0xc7 */,
+ 0 /* 0xc8 */, 0 /* 0xc9 */, 0 /* 0xca */, 0 /* 0xcb */,
+ 0 /* 0xcc */, 0 /* 0xcd */, 0 /* 0xce */, 0 /* 0xcf */,
+ 0 /* 0xd0 */, 0 /* 0xd1 */, 0 /* 0xd2 */, 0 /* 0xd3 */,
+ 0 /* 0xd4 */, 0 /* 0xd5 */, 0 /* 0xd6 */, 0 /* 0xd7 */,
+ 0 /* 0xd8 */, 0 /* 0xd9 */, 0 /* 0xda */, 0 /* 0xdb */,
+ 0 /* 0xdc */, 0 /* 0xdd */, 0 /* 0xde */, 0 /* 0xdf */,
+ 0 /* 0xe0 */, 0 /* 0xe1 */, 0 /* 0xe2 */, 0 /* 0xe3 */,
+ 0 /* 0xe4 */, 0 /* 0xe5 */, 0 /* 0xe6 */, 0 /* 0xe7 */,
+ 0 /* 0xe8 */, 0 /* 0xe9 */, 0 /* 0xea */, 0 /* 0xeb */,
+ 0 /* 0xec */, 0 /* 0xed */, 0 /* 0xee */, 0 /* 0xef */,
+ 0 /* 0xf0 */, 0 /* 0xf1 */, 0 /* 0xf2 */, 0 /* 0xf3 */,
+ 0 /* 0xf4 */, 0 /* 0xf5 */, 0 /* 0xf6 */, 0 /* 0xf7 */,
+ 0 /* 0xf8 */, 0 /* 0xf9 */, 0 /* 0xfa */, 0 /* 0xfb */,
+ 0 /* 0xfc */, 0 /* 0xfd */, 0 /* 0xfe */, 0 /* 0xff */
+};
+
+int nghttp2_check_authority(const uint8_t *value, size_t len) {
+ const uint8_t *last;
+ for (last = value + len; value != last; ++value) {
+ if (!VALID_AUTHORITY_CHARS[*value]) {
+ return 0;
+ }
+ }
+ return 1;
+}
+
uint8_t *nghttp2_cpymem(uint8_t *dest, const void *src, size_t len) {
if (len == 0) {
return dest;
diff --git a/deps/nghttp2/lib/nghttp2_http.c b/deps/nghttp2/lib/nghttp2_http.c
index 8d990299838193..62f57b6aec779c 100644
--- a/deps/nghttp2/lib/nghttp2_http.c
+++ b/deps/nghttp2/lib/nghttp2_http.c
@@ -305,84 +305,6 @@ static int http_response_on_header(nghttp2_stream *stream, nghttp2_hd_nv *nv,
return 0;
}
-/* Generated by genauthroitychartbl.py */
-static char VALID_AUTHORITY_CHARS[] = {
- 0 /* NUL */, 0 /* SOH */, 0 /* STX */, 0 /* ETX */,
- 0 /* EOT */, 0 /* ENQ */, 0 /* ACK */, 0 /* BEL */,
- 0 /* BS */, 0 /* HT */, 0 /* LF */, 0 /* VT */,
- 0 /* FF */, 0 /* CR */, 0 /* SO */, 0 /* SI */,
- 0 /* DLE */, 0 /* DC1 */, 0 /* DC2 */, 0 /* DC3 */,
- 0 /* DC4 */, 0 /* NAK */, 0 /* SYN */, 0 /* ETB */,
- 0 /* CAN */, 0 /* EM */, 0 /* SUB */, 0 /* ESC */,
- 0 /* FS */, 0 /* GS */, 0 /* RS */, 0 /* US */,
- 0 /* SPC */, 1 /* ! */, 0 /* " */, 0 /* # */,
- 1 /* $ */, 1 /* % */, 1 /* & */, 1 /* ' */,
- 1 /* ( */, 1 /* ) */, 1 /* * */, 1 /* + */,
- 1 /* , */, 1 /* - */, 1 /* . */, 0 /* / */,
- 1 /* 0 */, 1 /* 1 */, 1 /* 2 */, 1 /* 3 */,
- 1 /* 4 */, 1 /* 5 */, 1 /* 6 */, 1 /* 7 */,
- 1 /* 8 */, 1 /* 9 */, 1 /* : */, 1 /* ; */,
- 0 /* < */, 1 /* = */, 0 /* > */, 0 /* ? */,
- 1 /* @ */, 1 /* A */, 1 /* B */, 1 /* C */,
- 1 /* D */, 1 /* E */, 1 /* F */, 1 /* G */,
- 1 /* H */, 1 /* I */, 1 /* J */, 1 /* K */,
- 1 /* L */, 1 /* M */, 1 /* N */, 1 /* O */,
- 1 /* P */, 1 /* Q */, 1 /* R */, 1 /* S */,
- 1 /* T */, 1 /* U */, 1 /* V */, 1 /* W */,
- 1 /* X */, 1 /* Y */, 1 /* Z */, 1 /* [ */,
- 0 /* \ */, 1 /* ] */, 0 /* ^ */, 1 /* _ */,
- 0 /* ` */, 1 /* a */, 1 /* b */, 1 /* c */,
- 1 /* d */, 1 /* e */, 1 /* f */, 1 /* g */,
- 1 /* h */, 1 /* i */, 1 /* j */, 1 /* k */,
- 1 /* l */, 1 /* m */, 1 /* n */, 1 /* o */,
- 1 /* p */, 1 /* q */, 1 /* r */, 1 /* s */,
- 1 /* t */, 1 /* u */, 1 /* v */, 1 /* w */,
- 1 /* x */, 1 /* y */, 1 /* z */, 0 /* { */,
- 0 /* | */, 0 /* } */, 1 /* ~ */, 0 /* DEL */,
- 0 /* 0x80 */, 0 /* 0x81 */, 0 /* 0x82 */, 0 /* 0x83 */,
- 0 /* 0x84 */, 0 /* 0x85 */, 0 /* 0x86 */, 0 /* 0x87 */,
- 0 /* 0x88 */, 0 /* 0x89 */, 0 /* 0x8a */, 0 /* 0x8b */,
- 0 /* 0x8c */, 0 /* 0x8d */, 0 /* 0x8e */, 0 /* 0x8f */,
- 0 /* 0x90 */, 0 /* 0x91 */, 0 /* 0x92 */, 0 /* 0x93 */,
- 0 /* 0x94 */, 0 /* 0x95 */, 0 /* 0x96 */, 0 /* 0x97 */,
- 0 /* 0x98 */, 0 /* 0x99 */, 0 /* 0x9a */, 0 /* 0x9b */,
- 0 /* 0x9c */, 0 /* 0x9d */, 0 /* 0x9e */, 0 /* 0x9f */,
- 0 /* 0xa0 */, 0 /* 0xa1 */, 0 /* 0xa2 */, 0 /* 0xa3 */,
- 0 /* 0xa4 */, 0 /* 0xa5 */, 0 /* 0xa6 */, 0 /* 0xa7 */,
- 0 /* 0xa8 */, 0 /* 0xa9 */, 0 /* 0xaa */, 0 /* 0xab */,
- 0 /* 0xac */, 0 /* 0xad */, 0 /* 0xae */, 0 /* 0xaf */,
- 0 /* 0xb0 */, 0 /* 0xb1 */, 0 /* 0xb2 */, 0 /* 0xb3 */,
- 0 /* 0xb4 */, 0 /* 0xb5 */, 0 /* 0xb6 */, 0 /* 0xb7 */,
- 0 /* 0xb8 */, 0 /* 0xb9 */, 0 /* 0xba */, 0 /* 0xbb */,
- 0 /* 0xbc */, 0 /* 0xbd */, 0 /* 0xbe */, 0 /* 0xbf */,
- 0 /* 0xc0 */, 0 /* 0xc1 */, 0 /* 0xc2 */, 0 /* 0xc3 */,
- 0 /* 0xc4 */, 0 /* 0xc5 */, 0 /* 0xc6 */, 0 /* 0xc7 */,
- 0 /* 0xc8 */, 0 /* 0xc9 */, 0 /* 0xca */, 0 /* 0xcb */,
- 0 /* 0xcc */, 0 /* 0xcd */, 0 /* 0xce */, 0 /* 0xcf */,
- 0 /* 0xd0 */, 0 /* 0xd1 */, 0 /* 0xd2 */, 0 /* 0xd3 */,
- 0 /* 0xd4 */, 0 /* 0xd5 */, 0 /* 0xd6 */, 0 /* 0xd7 */,
- 0 /* 0xd8 */, 0 /* 0xd9 */, 0 /* 0xda */, 0 /* 0xdb */,
- 0 /* 0xdc */, 0 /* 0xdd */, 0 /* 0xde */, 0 /* 0xdf */,
- 0 /* 0xe0 */, 0 /* 0xe1 */, 0 /* 0xe2 */, 0 /* 0xe3 */,
- 0 /* 0xe4 */, 0 /* 0xe5 */, 0 /* 0xe6 */, 0 /* 0xe7 */,
- 0 /* 0xe8 */, 0 /* 0xe9 */, 0 /* 0xea */, 0 /* 0xeb */,
- 0 /* 0xec */, 0 /* 0xed */, 0 /* 0xee */, 0 /* 0xef */,
- 0 /* 0xf0 */, 0 /* 0xf1 */, 0 /* 0xf2 */, 0 /* 0xf3 */,
- 0 /* 0xf4 */, 0 /* 0xf5 */, 0 /* 0xf6 */, 0 /* 0xf7 */,
- 0 /* 0xf8 */, 0 /* 0xf9 */, 0 /* 0xfa */, 0 /* 0xfb */,
- 0 /* 0xfc */, 0 /* 0xfd */, 0 /* 0xfe */, 0 /* 0xff */
-};
-
-static int check_authority(const uint8_t *value, size_t len) {
- const uint8_t *last;
- for (last = value + len; value != last; ++value) {
- if (!VALID_AUTHORITY_CHARS[*value]) {
- return 0;
- }
- }
- return 1;
-}
-
static int check_scheme(const uint8_t *value, size_t len) {
const uint8_t *last;
if (len == 0) {
@@ -440,7 +362,7 @@ int nghttp2_http_on_header(nghttp2_session *session, nghttp2_stream *stream,
if (nv->token == NGHTTP2_TOKEN__AUTHORITY ||
nv->token == NGHTTP2_TOKEN_HOST) {
- rv = check_authority(nv->value->base, nv->value->len);
+ rv = nghttp2_check_authority(nv->value->base, nv->value->len);
} else if (nv->token == NGHTTP2_TOKEN__SCHEME) {
rv = check_scheme(nv->value->base, nv->value->len);
} else {
diff --git a/deps/nghttp2/lib/nghttp2_session.c b/deps/nghttp2/lib/nghttp2_session.c
index 3420cfa2f1c653..9df3d6f32938a6 100644
--- a/deps/nghttp2/lib/nghttp2_session.c
+++ b/deps/nghttp2/lib/nghttp2_session.c
@@ -3735,7 +3735,6 @@ static int session_end_stream_headers_received(nghttp2_session *session,
static int session_after_header_block_received(nghttp2_session *session) {
int rv = 0;
- int call_cb = 1;
nghttp2_frame *frame = &session->iframe.frame;
nghttp2_stream *stream;
@@ -3789,21 +3788,25 @@ static int session_after_header_block_received(nghttp2_session *session) {
stream_id = frame->hd.stream_id;
}
- call_cb = 0;
-
rv = session_handle_invalid_stream2(session, stream_id, frame,
NGHTTP2_ERR_HTTP_MESSAGING);
if (nghttp2_is_fatal(rv)) {
return rv;
}
+
+ if (frame->hd.type == NGHTTP2_HEADERS &&
+ (frame->hd.flags & NGHTTP2_FLAG_END_STREAM)) {
+ nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_RD);
+ /* Don't call nghttp2_session_close_stream_if_shut_rdwr
+ because RST_STREAM has been submitted. */
+ }
+ return 0;
}
}
- if (call_cb) {
- rv = session_call_on_frame_received(session, frame);
- if (nghttp2_is_fatal(rv)) {
- return rv;
- }
+ rv = session_call_on_frame_received(session, frame);
+ if (nghttp2_is_fatal(rv)) {
+ return rv;
}
if (frame->hd.type != NGHTTP2_HEADERS) {
@@ -4942,7 +4945,6 @@ static int session_process_extension_frame(nghttp2_session *session) {
int nghttp2_session_on_data_received(nghttp2_session *session,
nghttp2_frame *frame) {
int rv = 0;
- int call_cb = 1;
nghttp2_stream *stream;
/* We don't call on_frame_recv_callback if stream has been closed
@@ -4958,20 +4960,22 @@ int nghttp2_session_on_data_received(nghttp2_session *session,
if (session_enforce_http_messaging(session) &&
(frame->hd.flags & NGHTTP2_FLAG_END_STREAM)) {
if (nghttp2_http_on_remote_end_stream(stream) != 0) {
- call_cb = 0;
rv = nghttp2_session_add_rst_stream(session, stream->stream_id,
NGHTTP2_PROTOCOL_ERROR);
if (nghttp2_is_fatal(rv)) {
return rv;
}
+
+ nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_RD);
+ /* Don't call nghttp2_session_close_stream_if_shut_rdwr because
+ RST_STREAM has been submitted. */
+ return 0;
}
}
- if (call_cb) {
- rv = session_call_on_frame_received(session, frame);
- if (nghttp2_is_fatal(rv)) {
- return rv;
- }
+ rv = session_call_on_frame_received(session, frame);
+ if (nghttp2_is_fatal(rv)) {
+ return rv;
}
if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
@@ -5409,8 +5413,8 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
case NGHTTP2_IB_READ_CLIENT_MAGIC:
readlen = nghttp2_min(inlen, iframe->payloadleft);
- if (memcmp(NGHTTP2_CLIENT_MAGIC + NGHTTP2_CLIENT_MAGIC_LEN -
- iframe->payloadleft,
+ if (memcmp(&NGHTTP2_CLIENT_MAGIC[NGHTTP2_CLIENT_MAGIC_LEN -
+ iframe->payloadleft],
in, readlen) != 0) {
return NGHTTP2_ERR_BAD_CLIENT_MAGIC;
}
diff --git a/deps/npm/.npmignore b/deps/npm/.npmignore
index 12efef27852da6..c42aaf956257d5 100644
--- a/deps/npm/.npmignore
+++ b/deps/npm/.npmignore
@@ -1,11 +1,13 @@
*.swp
.*.swp
+netlify.toml
npm-debug.log
/.github
/test
node_modules/marked
node_modules/marked-man
node_modules/tap
+tap-snapshots
node_modules/.bin
node_modules/npm-registry-mock
/npmrc
diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS
index 14356c0d919b5a..eef45f2df19be2 100644
--- a/deps/npm/AUTHORS
+++ b/deps/npm/AUTHORS
@@ -663,3 +663,12 @@ Christian Clauss
Nikita Lebedev
Henrik Gemal
Philip Harrison
+Jason Etcovitch
+Darcy Clarke
+orion
+NoDocCat
+joan xie
+Amal Hussein
+Brett Zamir
+Menelaos Kotsollaris
+Mehdi Hasan Khan
diff --git a/deps/npm/CHANGELOG.md b/deps/npm/CHANGELOG.md
index ea7bfdb3a98437..d83c57f6d9a772 100644
--- a/deps/npm/CHANGELOG.md
+++ b/deps/npm/CHANGELOG.md
@@ -1,3 +1,110 @@
+## 6.13.1 (2019-11-18)
+
+### BUG FIXES
+
+* [`938d6124d`](https://github.com/npm/cli/commit/938d6124d6d15d96b5a69d0ae32ef59fceb8ceab)
+ [#472](https://github.com/npm/cli/pull/472)
+ fix(fund): support funding string shorthand
+ ([@ruyadorno](https://github.com/ruyadorno))
+* [`b49c5535b`](https://github.com/npm/cli/commit/b49c5535b7c41729a8d167b035924c3c66b36de0)
+ [#471](https://github.com/npm/cli/pull/471)
+ should not publish tap-snapshot folder
+ ([@ruyadorno](https://github.com/ruyadorno))
+* [`3471d5200`](https://github.com/npm/cli/commit/3471d5200217bfa612b1a262e36c9c043a52eb09)
+ [#253](https://github.com/npm/cli/pull/253)
+ Add preliminary WSL support for npm and npx
+ ([@infinnie](https://github.com/infinnie))
+* [`3ef295f23`](https://github.com/npm/cli/commit/3ef295f23ee1b2300abf13ec19e935c47a455179)
+ [#486](https://github.com/npm/cli/pull/486)
+ print quick audit report for human output
+ ([@isaacs](https://github.com/isaacs))
+
+### TESTING
+
+* [`dbbf977ac`](https://github.com/npm/cli/commit/dbbf977acd1e74bcdec859c562ea4a2bc0536442)
+ [#278](https://github.com/npm/cli/pull/278)
+ added workflow to trigger and run benchmarks
+ ([@mikemimik](https://github.com/mikemimik))
+* [`b4f5e3825`](https://github.com/npm/cli/commit/b4f5e3825535256aaada09c5e8f104570a3d96a4)
+ [#457](https://github.com/npm/cli/pull/457)
+ feat(docs): adding tests and updating docs to reflect changes in registry teams API.
+ ([@nomadtechie](https://github.com/nomadtechie))
+* [`454c7dd60`](https://github.com/npm/cli/commit/454c7dd60c78371bf606f11a17ed0299025bc37c)
+ [#456](https://github.com/npm/cli/pull/456)
+ fix git configs for git 2.23 and above
+ ([@isaacs](https://github.com/isaacs))
+
+### DOCUMENTATION
+
+* [`b8c1576a4`](https://github.com/npm/cli/commit/b8c1576a448566397c721655b95fc90bf202b35a) [`30b013ae8`](https://github.com/npm/cli/commit/30b013ae8eacd04b1b8a41ce2ed0dd50c8ebae25) [`26c1b2ef6`](https://github.com/npm/cli/commit/26c1b2ef6be1595d28d935d35faa8ec72daae544) [`9f943a765`](https://github.com/npm/cli/commit/9f943a765faf6ebb8a442e862b808dbb630e018d) [`c0346b158`](https://github.com/npm/cli/commit/c0346b158fc25ab6ca9954d4dd78d9e62f573a41) [`8e09d5ad6`](https://github.com/npm/cli/commit/8e09d5ad67d4f142241193cecbce61c659389be3) [`4a2f551ee`](https://github.com/npm/cli/commit/4a2f551eeb3285f6f200534da33644789715a41a) [`87d67258c`](https://github.com/npm/cli/commit/87d67258c213d9ea9a49ce1804294a718f08ff13) [`5c3b32722`](https://github.com/npm/cli/commit/5c3b3272234764c8b4d2d798b69af077b5a529c7) [`b150eaeff`](https://github.com/npm/cli/commit/b150eaeff428180bfa03be53fd741d5625897758) [`7555a743c`](https://github.com/npm/cli/commit/7555a743ce4c3146d6245dd63f91503c7f439a6c) [`b89423e2f`](https://github.com/npm/cli/commit/b89423e2f6a09b290b15254e7ff7e8033b434d83)
+ [#463](https://github.com/npm/cli/pull/463)
+ [#285](https://github.com/npm/cli/pull/285)
+ [#268](https://github.com/npm/cli/pull/268)
+ [#232](https://github.com/npm/cli/pull/232)
+ [#485](https://github.com/npm/cli/pull/485)
+ [#453](https://github.com/npm/cli/pull/453)
+ docs cleanup: typos, styling and content
+ ([@claudiahdz](https://github.com/claudiahdz))
+ ([@XhmikosR](https://github.com/XhmikosR))
+ ([@mugli](https://github.com/mugli))
+ ([@brettz9](https://github.com/brettz9))
+ ([@mkotsollaris](https://github.com/mkotsollaris))
+
+### DEPENDENCIES
+
+* [`661d86cd2`](https://github.com/npm/cli/commit/661d86cd229b14ddf687b7f25a66941a79d233e7)
+ `make-fetch-happen@5.0.2`
+ ([@claudiahdz](https://github.com/claudiahdz))
+
+## 6.13.0 (2019-11-05)
+
+### NEW FEATURES
+
+* [`4414b06d9`](https://github.com/npm/cli/commit/4414b06d944c56bee05ccfb85260055a767ee334)
+ [#273](https://github.com/npm/cli/pull/273)
+ add fund command
+ ([@ruyadorno](https://github.com/ruyadorno))
+
+### DOCUMENTATION
+
+* [`ae4c74d04`](https://github.com/npm/cli/commit/ae4c74d04f820a0255a92bdfe77ecf97af134fae)
+ [#274](https://github.com/npm/cli/pull/274)
+ migrate existing docs to gatsby
+ ([@claudiahdz](https://github.com/claudiahdz))
+* [`4ff1bb180`](https://github.com/npm/cli/commit/4ff1bb180b1db8c72e51b3d57bd4e268b738e049)
+ [#277](https://github.com/npm/cli/pull/277)
+ updated documentation copy
+ ([@oletizi](https://github.com/oletizi))
+
+### BUG FIXES
+
+* [`e4455409f`](https://github.com/npm/cli/commit/e4455409fe6fe9c198b250b488129171f0b4624a)
+ [#281](https://github.com/npm/cli/pull/281)
+ delete ps1 files on package removal
+ ([@NoDocCat](https://github.com/NoDocCat))
+* [`cd14d4701`](https://github.com/npm/cli/commit/cd14d47014e8c96ffd6a18791e8752028b19d637)
+ [#279](https://github.com/npm/cli/pull/279)
+ update supported node list to remove v6.0, v6.1, v9.0 - v9.2
+ ([@ljharb](https://github.com/ljharb))
+
+### DEPENDENCIES
+
+* [`a37296b20`](https://github.com/npm/cli/commit/a37296b20ca3e19c2bbfa78fedcfe695e03fda69)
+ `pacote@9.5.9`
+* [`d3cb3abe8`](https://github.com/npm/cli/commit/d3cb3abe8cee54bd2624acdcf8043932ef0d660a)
+ `read-cmd-shim@1.0.5`
+
+### TESTING
+
+* [`688cd97be`](https://github.com/npm/cli/commit/688cd97be94ca949719424ff69ff515a68c5caba)
+ [#272](https://github.com/npm/cli/pull/272)
+ use github actions for CI
+ ([@JasonEtco](https://github.com/JasonEtco))
+* [`9a2d8af84`](https://github.com/npm/cli/commit/9a2d8af84f7328f13d8f578cf4b150b9d5f09517)
+ [#240](https://github.com/npm/cli/pull/240)
+ Clean up some flakiness and inconsistency
+ ([@isaacs](https://github.com/isaacs))
+
## 6.12.1 (2019-10-29)
### BUG FIXES
diff --git a/deps/npm/Makefile b/deps/npm/Makefile
index 4e00647a19cf08..11e656c43a458f 100644
--- a/deps/npm/Makefile
+++ b/deps/npm/Makefile
@@ -4,51 +4,25 @@ SHELL = bash
PUBLISHTAG = $(shell node scripts/publish-tag.js)
BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
-markdowns = $(shell find doc -name '*.md' | grep -v 'index') README.md
+markdowns = $(shell find docs -name '*.md' | grep -v 'index') README.md
-html_docdeps = html/dochead.html \
- html/docfoot.html \
- scripts/doc-build.sh \
- package.json
-
-cli_mandocs = $(shell find doc/cli -name '*.md' \
+cli_mandocs = $(shell find docs/content/cli-commands -name '*.md' \
|sed 's|.md|.1|g' \
- |sed 's|doc/cli/|man/man1/|g' ) \
+ |sed 's|docs/content/cli-commands/|man/man1/|g' ) \
man/man1/npm-README.1 \
man/man1/npx.1
-files_mandocs = $(shell find doc/files -name '*.md' \
+files_mandocs = $(shell find docs/content/configuring-npm -name '*.md' \
|sed 's|.md|.5|g' \
- |sed 's|doc/files/|man/man5/|g' ) \
- man/man5/npm-json.5 \
- man/man5/npm-global.5
+ |sed 's|docs/content/configuring-npm/|man/man5/|g' ) \
-misc_mandocs = $(shell find doc/misc -name '*.md' \
+misc_mandocs = $(shell find docs/content/using-npm -name '*.md' \
|sed 's|.md|.7|g' \
- |sed 's|doc/misc/|man/man7/|g' ) \
- man/man7/npm-index.7
-
-cli_htmldocs = $(shell find doc/cli -name '*.md' \
- |sed 's|.md|.html|g' \
- |sed 's|doc/cli/|html/doc/cli/|g' ) \
- html/doc/README.html
-
-files_htmldocs = $(shell find doc/files -name '*.md' \
- |sed 's|.md|.html|g' \
- |sed 's|doc/files/|html/doc/files/|g' ) \
- html/doc/files/npm-json.html \
- html/doc/files/npm-global.html
-
-misc_htmldocs = $(shell find doc/misc -name '*.md' \
- |sed 's|.md|.html|g' \
- |sed 's|doc/misc/|html/doc/misc/|g' ) \
- html/doc/index.html
+ |sed 's|docs/content/using-npm/|man/man7/|g' ) \
mandocs = $(cli_mandocs) $(files_mandocs) $(misc_mandocs)
-htmldocs = $(cli_htmldocs) $(files_htmldocs) $(misc_htmldocs)
-
-all: doc
+all: docs
latest:
@echo "Installing latest published npm"
@@ -65,14 +39,21 @@ dev: install
link: uninstall
node bin/npm-cli.js link -f
-clean: markedclean marked-manclean doc-clean
+clean: markedclean marked-manclean docs-clean
rm -rf npmrc
node bin/npm-cli.js cache clean --force
uninstall:
node bin/npm-cli.js rm npm -g -f
-doc: $(mandocs) $(htmldocs)
+mandocs: $(mandocs)
+
+htmldocs:
+ cd docs && node ../bin/npm-cli.js install && \
+ node ../bin/npm-cli.js run build:static echo>&2 && \
+ rm -rf node_modules .cache public/*js public/*json public/404* public/page-data public/manifest*
+
+docs: mandocs htmldocs
markedclean:
rm -rf node_modules/marked node_modules/.bin/marked .building_marked
@@ -80,26 +61,28 @@ markedclean:
marked-manclean:
rm -rf node_modules/marked-man node_modules/.bin/marked-man .building_marked-man
-docclean: doc-clean
-doc-clean:
+docsclean: docs-clean
+docs-clean:
rm -rf \
.building_marked \
.building_marked-man \
- html/doc \
- man
+ man \
+ docs/node_modules \
+ docs/public \
+ docs/.cache
## build-time tools for the documentation
build-doc-tools := node_modules/.bin/marked \
node_modules/.bin/marked-man
# use `npm install marked-man` for this to work.
-man/man1/npm-README.1: README.md scripts/doc-build.sh package.json $(build-doc-tools)
+man/man1/npm-README.1: README.md scripts/docs-build.js package.json $(build-doc-tools)
@[ -d man/man1 ] || mkdir -p man/man1
- scripts/doc-build.sh $< $@
+ node scripts/docs-build.js $< $@
-man/man1/%.1: doc/cli/%.md scripts/doc-build.sh package.json $(build-doc-tools)
+man/man1/%.1: docs/content/cli-commands/%.md scripts/docs-build.js package.json $(build-doc-tools)
@[ -d man/man1 ] || mkdir -p man/man1
- scripts/doc-build.sh $< $@
+ node scripts/docs-build.js $< $@
man/man1/npx.1: node_modules/libnpx/libnpx.1
cat $< | sed s/libnpx/npx/ > $@
@@ -107,46 +90,16 @@ man/man1/npx.1: node_modules/libnpx/libnpx.1
man/man5/npm-json.5: man/man5/package.json.5
cp $< $@
-man/man5/npm-global.5: man/man5/npm-folders.5
+man/man5/npm-global.5: man/man5/folders.5
cp $< $@
-man/man5/%.5: doc/files/%.md scripts/doc-build.sh package.json $(build-doc-tools)
+man/man5/%.5: docs/content/configuring-npm/%.md scripts/docs-build.js package.json $(build-doc-tools)
@[ -d man/man5 ] || mkdir -p man/man5
- scripts/doc-build.sh $< $@
-
-doc/misc/npm-index.md: scripts/index-build.js package.json $(build-doc-tools)
- node scripts/index-build.js > $@
+ node scripts/docs-build.js $< $@
-html/doc/index.html: doc/misc/npm-index.md $(html_docdeps) $(build-doc-tools)
- @[ -d html/doc ] || mkdir -p html/doc
- scripts/doc-build.sh $< $@
-
-man/man7/%.7: doc/misc/%.md scripts/doc-build.sh package.json $(build-doc-tools)
+man/man7/%.7: docs/content/using-npm/%.md scripts/docs-build.js package.json $(build-doc-tools)
@[ -d man/man7 ] || mkdir -p man/man7
- scripts/doc-build.sh $< $@
-
-html/doc/README.html: README.md $(html_docdeps) $(build-doc-tools)
- @[ -d html/doc ] || mkdir -p html/doc
- scripts/doc-build.sh $< $@
-
-html/doc/cli/%.html: doc/cli/%.md $(html_docdeps) $(build-doc-tools)
- @[ -d html/doc/cli ] || mkdir -p html/doc/cli
- scripts/doc-build.sh $< $@
-
-html/doc/files/npm-json.html: html/doc/files/package.json.html
- cp $< $@
-
-html/doc/files/npm-global.html: html/doc/files/npm-folders.html
- cp $< $@
-
-html/doc/files/%.html: doc/files/%.md $(html_docdeps) $(build-doc-tools)
- @[ -d html/doc/files ] || mkdir -p html/doc/files
- scripts/doc-build.sh $< $@
-
-html/doc/misc/%.html: doc/misc/%.md $(html_docdeps) $(build-doc-tools)
- @[ -d html/doc/misc ] || mkdir -p html/doc/misc
- scripts/doc-build.sh $< $@
-
+ node scripts/docs-build.js $< $@
marked: node_modules/.bin/marked
@@ -158,11 +111,7 @@ marked-man: node_modules/.bin/marked-man
node_modules/.bin/marked-man:
node bin/npm-cli.js install marked-man --no-global --no-timing --no-save
-doc: man
-
-man: $(cli_docs)
-
-test: doc
+test: docs
node bin/npm-cli.js test
tag:
@@ -174,17 +123,17 @@ ls-ok:
gitclean:
git clean -fd
-publish: gitclean ls-ok link doc-clean doc
+publish: gitclean ls-ok link docs-clean docs
@git push origin :v$(shell node bin/npm-cli.js --no-timing -v) 2>&1 || true
git push origin $(BRANCH) &&\
git push origin --tags &&\
node bin/npm-cli.js publish --tag=$(PUBLISHTAG)
-release: gitclean ls-ok markedclean marked-manclean doc-clean doc
+release: gitclean ls-ok markedclean marked-manclean docs-clean doc
node bin/npm-cli.js prune --production --no-save
@bash scripts/release.sh
sandwich:
@[ $$(whoami) = "root" ] && (echo "ok"; echo "ham" > sandwich) || (echo "make it yourself" && exit 13)
-.PHONY: all latest install dev link doc clean uninstall test man doc-clean docclean release ls-ok realclean
+.PHONY: all latest install dev link doc clean uninstall test man docs-clean docclean release ls-ok realclean
diff --git a/deps/npm/README.md b/deps/npm/README.md
index bb33879fd0118f..16c7e4b18cdf00 100644
--- a/deps/npm/README.md
+++ b/deps/npm/README.md
@@ -163,4 +163,3 @@ doubt tell you to put the output in a gist or email.
* npm(1)
* npm-help(1)
-* npm-index(7)
diff --git a/deps/npm/bin/npm b/deps/npm/bin/npm
index 4183703a7857e9..737d1f17064890 100755
--- a/deps/npm/bin/npm
+++ b/deps/npm/bin/npm
@@ -8,6 +8,10 @@ case `uname` in
esac
NODE_EXE="$basedir/node.exe"
+if [ -x "$NODE_EXE" ] && [ -f "/bin/wslpath" ]; then # run the corresponding command prompt when Node for Windows is executed within WSL
+ cmd.exe /c `wslpath -w "$basedir/npm.cmd"` "$@"
+ exit $?
+fi
if ! [ -x "$NODE_EXE" ]; then
NODE_EXE="$basedir/node"
fi
diff --git a/deps/npm/bin/npx b/deps/npm/bin/npx
index 261e339850da5e..3516c8c415dba2 100644
--- a/deps/npm/bin/npx
+++ b/deps/npm/bin/npx
@@ -8,6 +8,10 @@ case `uname` in
esac
NODE_EXE="$basedir/node.exe"
+if [ -x "$NODE_EXE" ] && [ -f "/bin/wslpath" ]; then # run the corresponding command prompt when Node for Windows is executed within WSL
+ cmd.exe /c `wslpath -w "$basedir/npx.cmd"` "$@"
+ exit $?
+fi
if ! [ -x "$NODE_EXE" ]; then
NODE_EXE=node
fi
diff --git a/deps/npm/changelogs/CHANGELOG-3.md b/deps/npm/changelogs/CHANGELOG-3.md
index c13159a5c9dcb2..fc55a696fb22a7 100644
--- a/deps/npm/changelogs/CHANGELOG-3.md
+++ b/deps/npm/changelogs/CHANGELOG-3.md
@@ -47,7 +47,7 @@ This is gonna be a much, MUCH smaller major version than 3.x was. Maybe even
smaller than 2.x was. I can't tell you everything that'll be in there just
yet, but at the very least it's going to have what's in our
[4.x milestone](https://github.com/npm/npm/pulls?q=is%3Aopen+is%3Apr+milestone%3A4.x),
-PLUS, the first steps in
+PLUS, the first steps in
[making `prepublish` work](https://github.com/npm/npm/issues/10074) the way
people expect it to.
diff --git a/deps/npm/changelogs/CHANGELOG-5.md b/deps/npm/changelogs/CHANGELOG-5.md
index b4c75b3d819064..57496984913d6f 100644
--- a/deps/npm/changelogs/CHANGELOG-5.md
+++ b/deps/npm/changelogs/CHANGELOG-5.md
@@ -225,7 +225,7 @@ as `https://` URLs instead of versions.
zeros deleted resulted in authentication failures.
([@iarna](https://github.com/iarna))
* [`6eaa860ea`](https://github.com/npm/npm/commit/6eaa860ead3222a6dbd6d370b4271e7bf242b30b)
- Eliminate direct use of `new Buffer` in `npm`. While the use of it in `npm` was safe, there
+ Eliminate direct use of `new Buffer` in `npm`. While the use of it in `npm` was safe, there
are two other reasons for this change:
1. Node 10 emits warnings about its use.
@@ -341,7 +341,7 @@ and a handful of bug fixes! Let's get right in!
### NEW PACKAGE VIEW
-There's a new `npm view` in town. You might it as `npm info` or `npm show`.
+There's a new `npm view` in town. You might it as `npm info` or `npm show`.
The new output gives you a nicely summarized view that for most packages
fits on one screen. If you ask it for `--json` you'll still get the same
results, so your scripts should still work fine.
@@ -377,7 +377,7 @@ you can double check your `.npmignore` settings before doing a publish.
### MERGE CONFLICT, SMERGE CONFLICT
If you resolve a `package-lock.json` merge conflict with `npm install` we
-now suggest you setup a merge driver to handle these automatically for you.
+now suggest you setup a merge driver to handle these automatically for you.
If you're reading this and you'd like to set it up now, run:
```console
diff --git a/deps/npm/doc/cli/npm-bin.md b/deps/npm/doc/cli/npm-bin.md
deleted file mode 100644
index 9b76ec529e30a0..00000000000000
--- a/deps/npm/doc/cli/npm-bin.md
+++ /dev/null
@@ -1,19 +0,0 @@
-npm-bin(1) -- Display npm bin folder
-====================================
-
-## SYNOPSIS
-
- npm bin [-g|--global]
-
-## DESCRIPTION
-
-Print the folder where npm will install executables.
-
-## SEE ALSO
-
-* npm-prefix(1)
-* npm-root(1)
-* npm-folders(5)
-* npm-config(1)
-* npm-config(7)
-* npmrc(5)
diff --git a/deps/npm/doc/cli/npm-bugs.md b/deps/npm/doc/cli/npm-bugs.md
deleted file mode 100644
index 55bce12f23fa37..00000000000000
--- a/deps/npm/doc/cli/npm-bugs.md
+++ /dev/null
@@ -1,43 +0,0 @@
-npm-bugs(1) -- Bugs for a package in a web browser maybe
-========================================================
-
-## SYNOPSIS
-
- npm bugs []
-
- aliases: issues
-
-## DESCRIPTION
-
-This command tries to guess at the likely location of a package's
-bug tracker URL, and then tries to open it using the `--browser`
-config param. If no package name is provided, it will search for
-a `package.json` in the current folder and use the `name` property.
-
-## CONFIGURATION
-
-### browser
-
-* Default: OS X: `"open"`, Windows: `"start"`, Others: `"xdg-open"`
-* Type: String
-
-The browser that is called by the `npm bugs` command to open websites.
-
-### registry
-
-* Default: https://registry.npmjs.org/
-* Type: url
-
-The base URL of the npm package registry.
-
-
-## SEE ALSO
-
-* npm-docs(1)
-* npm-view(1)
-* npm-publish(1)
-* npm-registry(7)
-* npm-config(1)
-* npm-config(7)
-* npmrc(5)
-* package.json(5)
diff --git a/deps/npm/doc/cli/npm-build.md b/deps/npm/doc/cli/npm-build.md
deleted file mode 100644
index 019f225850dc04..00000000000000
--- a/deps/npm/doc/cli/npm-build.md
+++ /dev/null
@@ -1,25 +0,0 @@
-npm-build(1) -- Build a package
-===============================
-
-## SYNOPSIS
-
- npm build []
-
-* ``:
- A folder containing a `package.json` file in its root.
-
-## DESCRIPTION
-
-This is the plumbing command called by `npm link` and `npm install`.
-
-It should generally be called during installation, but if you need to run it
-directly, run:
-
- npm run-script build
-
-## SEE ALSO
-
-* npm-install(1)
-* npm-link(1)
-* npm-scripts(7)
-* package.json(5)
diff --git a/deps/npm/doc/cli/npm-config.md b/deps/npm/doc/cli/npm-config.md
deleted file mode 100644
index c60afc167c7420..00000000000000
--- a/deps/npm/doc/cli/npm-config.md
+++ /dev/null
@@ -1,73 +0,0 @@
-npm-config(1) -- Manage the npm configuration files
-===================================================
-
-## SYNOPSIS
-
- npm config set [-g|--global]
- npm config get
- npm config delete
- npm config list [-l] [--json]
- npm config edit
- npm get
- npm set [-g|--global]
-
- aliases: c
-
-## DESCRIPTION
-
-npm gets its config settings from the command line, environment
-variables, `npmrc` files, and in some cases, the `package.json` file.
-
-See npmrc(5) for more information about the npmrc files.
-
-See `npm-config(7)` for a more thorough discussion of the mechanisms
-involved.
-
-The `npm config` command can be used to update and edit the contents
-of the user and global npmrc files.
-
-## Sub-commands
-
-Config supports the following sub-commands:
-
-### set
-
- npm config set key value
-
-Sets the config key to the value.
-
-If value is omitted, then it sets it to "true".
-
-### get
-
- npm config get key
-
-Echo the config value to stdout.
-
-### list
-
- npm config list
-
-Show all the config settings. Use `-l` to also show defaults. Use `--json`
-to show the settings in json format.
-
-### delete
-
- npm config delete key
-
-Deletes the key from all configuration files.
-
-### edit
-
- npm config edit
-
-Opens the config file in an editor. Use the `--global` flag to edit the
-global config.
-
-## SEE ALSO
-
-* npm-folders(5)
-* npm-config(7)
-* package.json(5)
-* npmrc(5)
-* npm(1)
diff --git a/deps/npm/doc/cli/npm-docs.md b/deps/npm/doc/cli/npm-docs.md
deleted file mode 100644
index f5064c55e2829a..00000000000000
--- a/deps/npm/doc/cli/npm-docs.md
+++ /dev/null
@@ -1,44 +0,0 @@
-npm-docs(1) -- Docs for a package in a web browser maybe
-========================================================
-
-## SYNOPSIS
-
- npm docs [ [ ...]]
- npm docs .
- npm home [ [ ...]]
- npm home .
-
-## DESCRIPTION
-
-This command tries to guess at the likely location of a package's
-documentation URL, and then tries to open it using the `--browser`
-config param. You can pass multiple package names at once. If no
-package name is provided, it will search for a `package.json` in
-the current folder and use the `name` property.
-
-## CONFIGURATION
-
-### browser
-
-* Default: OS X: `"open"`, Windows: `"start"`, Others: `"xdg-open"`
-* Type: String
-
-The browser that is called by the `npm docs` command to open websites.
-
-### registry
-
-* Default: https://registry.npmjs.org/
-* Type: url
-
-The base URL of the npm package registry.
-
-
-## SEE ALSO
-
-* npm-view(1)
-* npm-publish(1)
-* npm-registry(7)
-* npm-config(1)
-* npm-config(7)
-* npmrc(5)
-* package.json(5)
diff --git a/deps/npm/doc/cli/npm-install-ci-test.md b/deps/npm/doc/cli/npm-install-ci-test.md
deleted file mode 100644
index 4cbab9144e48fa..00000000000000
--- a/deps/npm/doc/cli/npm-install-ci-test.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# npm install-ci-test(1) -- Install a project with a clean slate and run tests
-
-## SYNOPSIS
-
- npm install-ci-test
-
- alias: npm cit
-
-## DESCRIPTION
-
-This command runs an `npm ci` followed immediately by an `npm test`.
-
-## SEE ALSO
-
-- npm-ci(1)
-- npm-test(1)
diff --git a/deps/npm/doc/cli/npm-install-test.md b/deps/npm/doc/cli/npm-install-test.md
deleted file mode 100644
index 471b36f16b565d..00000000000000
--- a/deps/npm/doc/cli/npm-install-test.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# npm install-test(1) -- Install package(s) and run tests
-
-## SYNOPSIS
-
- npm install-test (with no args, in package dir)
- npm install-test [<@scope>/]
- npm install-test [<@scope>/]@
- npm install-test [<@scope>/]@
- npm install-test [<@scope>/]@
- npm install-test
- npm install-test
- npm install-test
-
- alias: npm it
- common options: [--save|--save-dev|--save-optional] [--save-exact] [--dry-run]
-
-## DESCRIPTION
-
-This command runs an `npm install` followed immediately by an `npm test`. It
-takes exactly the same arguments as `npm install`.
-
-## SEE ALSO
-
-- npm-install(1)
-- npm-test(1)
diff --git a/deps/npm/doc/cli/npm-ping.md b/deps/npm/doc/cli/npm-ping.md
deleted file mode 100644
index 3b2da9944bb242..00000000000000
--- a/deps/npm/doc/cli/npm-ping.md
+++ /dev/null
@@ -1,24 +0,0 @@
-npm-ping(1) -- Ping npm registry
-================================
-
-## SYNOPSIS
-
- npm ping [--registry ]
-
-## DESCRIPTION
-
-Ping the configured or given npm registry and verify authentication.
-If it works it will output something like:
-```
-Ping success: {*Details about registry*}
-```
-otherwise you will get:
-```
-Ping error: {*Detail about error}
-```
-
-## SEE ALSO
-
-* npm-config(1)
-* npm-config(7)
-* npmrc(5)
diff --git a/deps/npm/doc/cli/npm-prefix.md b/deps/npm/doc/cli/npm-prefix.md
deleted file mode 100644
index d36e538132fb26..00000000000000
--- a/deps/npm/doc/cli/npm-prefix.md
+++ /dev/null
@@ -1,24 +0,0 @@
-npm-prefix(1) -- Display prefix
-===============================
-
-## SYNOPSIS
-
- npm prefix [-g]
-
-## DESCRIPTION
-
-Print the local prefix to standard out. This is the closest parent directory
-to contain a `package.json` file or `node_modules` directory, unless `-g` is
-also specified.
-
-If `-g` is specified, this will be the value of the global prefix. See
-`npm-config(7)` for more detail.
-
-## SEE ALSO
-
-* npm-root(1)
-* npm-bin(1)
-* npm-folders(5)
-* npm-config(1)
-* npm-config(7)
-* npmrc(5)
diff --git a/deps/npm/doc/cli/npm-rebuild.md b/deps/npm/doc/cli/npm-rebuild.md
deleted file mode 100644
index 437737d9f4b563..00000000000000
--- a/deps/npm/doc/cli/npm-rebuild.md
+++ /dev/null
@@ -1,19 +0,0 @@
-npm-rebuild(1) -- Rebuild a package
-===================================
-
-## SYNOPSIS
-
- npm rebuild [[<@scope>/]...]
-
- alias: npm rb
-
-## DESCRIPTION
-
-This command runs the `npm build` command on the matched folders. This is useful
-when you install a new version of node, and must recompile all your C++ addons with
-the new binary.
-
-## SEE ALSO
-
-* npm-build(1)
-* npm-install(1)
diff --git a/deps/npm/doc/cli/npm-root.md b/deps/npm/doc/cli/npm-root.md
deleted file mode 100644
index a1d5bf8629913b..00000000000000
--- a/deps/npm/doc/cli/npm-root.md
+++ /dev/null
@@ -1,19 +0,0 @@
-npm-root(1) -- Display npm root
-===============================
-
-## SYNOPSIS
-
- npm root [-g]
-
-## DESCRIPTION
-
-Print the effective `node_modules` folder to standard out.
-
-## SEE ALSO
-
-* npm-prefix(1)
-* npm-bin(1)
-* npm-folders(5)
-* npm-config(1)
-* npm-config(7)
-* npmrc(5)
diff --git a/deps/npm/doc/cli/npm-shrinkwrap.md b/deps/npm/doc/cli/npm-shrinkwrap.md
deleted file mode 100644
index 4c223a86cc1b75..00000000000000
--- a/deps/npm/doc/cli/npm-shrinkwrap.md
+++ /dev/null
@@ -1,25 +0,0 @@
-npm-shrinkwrap(1) -- Lock down dependency versions for publication
-=====================================================
-
-## SYNOPSIS
-
- npm shrinkwrap
-
-## DESCRIPTION
-
-This command repurposes `package-lock.json` into a publishable
-`npm-shrinkwrap.json` or simply creates a new one. The file created and updated
-by this command will then take precedence over any other existing or future
-`package-lock.json` files. For a detailed explanation of the design and purpose
-of package locks in npm, see npm-package-locks(5).
-
-## SEE ALSO
-
-* npm-install(1)
-* npm-run-script(1)
-* npm-scripts(7)
-* package.json(5)
-* npm-package-locks(5)
-* package-lock.json(5)
-* npm-shrinkwrap.json(5)
-* npm-ls(1)
diff --git a/deps/npm/doc/cli/npm-star.md b/deps/npm/doc/cli/npm-star.md
deleted file mode 100644
index 87d90b560c2027..00000000000000
--- a/deps/npm/doc/cli/npm-star.md
+++ /dev/null
@@ -1,22 +0,0 @@
-npm-star(1) -- Mark your favorite packages
-==========================================
-
-## SYNOPSIS
-
- npm star [...]
- npm unstar [...]
-
-## DESCRIPTION
-
-"Starring" a package means that you have some interest in it. It's
-a vaguely positive way to show that you care.
-
-"Unstarring" is the same thing, but in reverse.
-
-It's a boolean thing. Starring repeatedly has no additional effect.
-
-## SEE ALSO
-
-* npm-view(1)
-* npm-whoami(1)
-* npm-adduser(1)
diff --git a/deps/npm/doc/cli/npm-stars.md b/deps/npm/doc/cli/npm-stars.md
deleted file mode 100644
index 1e225be29f3eda..00000000000000
--- a/deps/npm/doc/cli/npm-stars.md
+++ /dev/null
@@ -1,21 +0,0 @@
-npm-stars(1) -- View packages marked as favorites
-=================================================
-
-## SYNOPSIS
-
- npm stars []
-
-## DESCRIPTION
-
-If you have starred a lot of neat things and want to find them again
-quickly this command lets you do just that.
-
-You may also want to see your friend's favorite packages, in this case
-you will most certainly enjoy this command.
-
-## SEE ALSO
-
-* npm-star(1)
-* npm-view(1)
-* npm-whoami(1)
-* npm-adduser(1)
diff --git a/deps/npm/doc/cli/npm-start.md b/deps/npm/doc/cli/npm-start.md
deleted file mode 100644
index e43f02149935a9..00000000000000
--- a/deps/npm/doc/cli/npm-start.md
+++ /dev/null
@@ -1,24 +0,0 @@
-npm-start(1) -- Start a package
-===============================
-
-## SYNOPSIS
-
- npm start [-- ]
-
-## DESCRIPTION
-
-This runs an arbitrary command specified in the package's `"start"` property of
-its `"scripts"` object. If no `"start"` property is specified on the
-`"scripts"` object, it will run `node server.js`.
-
-As of [`npm@2.0.0`](https://blog.npmjs.org/post/98131109725/npm-2-0-0), you can
-use custom arguments when executing scripts. Refer to npm-run-script(1) for
-more details.
-
-## SEE ALSO
-
-* npm-run-script(1)
-* npm-scripts(7)
-* npm-test(1)
-* npm-restart(1)
-* npm-stop(1)
diff --git a/deps/npm/doc/cli/npm-stop.md b/deps/npm/doc/cli/npm-stop.md
deleted file mode 100644
index 92b14b417962bd..00000000000000
--- a/deps/npm/doc/cli/npm-stop.md
+++ /dev/null
@@ -1,18 +0,0 @@
-npm-stop(1) -- Stop a package
-=============================
-
-## SYNOPSIS
-
- npm stop [-- ]
-
-## DESCRIPTION
-
-This runs a package's "stop" script, if one was provided.
-
-## SEE ALSO
-
-* npm-run-script(1)
-* npm-scripts(7)
-* npm-test(1)
-* npm-start(1)
-* npm-restart(1)
diff --git a/deps/npm/doc/cli/npm-test.md b/deps/npm/doc/cli/npm-test.md
deleted file mode 100644
index 8a379e2efd0988..00000000000000
--- a/deps/npm/doc/cli/npm-test.md
+++ /dev/null
@@ -1,20 +0,0 @@
-npm-test(1) -- Test a package
-=============================
-
-## SYNOPSIS
-
- npm test [-- ]
-
- aliases: t, tst
-
-## DESCRIPTION
-
-This runs a package's "test" script, if one was provided.
-
-## SEE ALSO
-
-* npm-run-script(1)
-* npm-scripts(7)
-* npm-start(1)
-* npm-restart(1)
-* npm-stop(1)
diff --git a/deps/npm/doc/cli/npm-uninstall.md b/deps/npm/doc/cli/npm-uninstall.md
deleted file mode 100644
index 38302b20d61fcd..00000000000000
--- a/deps/npm/doc/cli/npm-uninstall.md
+++ /dev/null
@@ -1,53 +0,0 @@
-npm-uninstall(1) -- Remove a package
-=============================
-
-## SYNOPSIS
-
- npm uninstall [<@scope>/][@]... [-S|--save|-D|--save-dev|-O|--save-optional|--no-save]
-
- aliases: remove, rm, r, un, unlink
-
-## DESCRIPTION
-
-This uninstalls a package, completely removing everything npm installed
-on its behalf.
-
-Example:
-
- npm uninstall sax
-
-In global mode (ie, with `-g` or `--global` appended to the command),
-it uninstalls the current package context as a global package.
-
-`npm uninstall` takes 3 exclusive, optional flags which save or update
-the package version in your main package.json:
-
-* `-S, --save`: Package will be removed from your `dependencies`.
-
-* `-D, --save-dev`: Package will be removed from your `devDependencies`.
-
-* `-O, --save-optional`: Package will be removed from your `optionalDependencies`.
-
-* `--no-save`: Package will not be removed from your `package.json` file.
-
-Further, if you have an `npm-shrinkwrap.json` then it will be updated as
-well.
-
-Scope is optional and follows the usual rules for `npm-scope(7)`.
-
-Examples:
-
- npm uninstall sax --save
- npm uninstall @myorg/privatepackage --save
- npm uninstall node-tap --save-dev
- npm uninstall dtrace-provider --save-optional
- npm uninstall lodash --no-save
-
-## SEE ALSO
-
-* npm-prune(1)
-* npm-install(1)
-* npm-folders(5)
-* npm-config(1)
-* npm-config(7)
-* npmrc(5)
diff --git a/deps/npm/doc/cli/npm-whoami.md b/deps/npm/doc/cli/npm-whoami.md
deleted file mode 100644
index 70b6a48f44671c..00000000000000
--- a/deps/npm/doc/cli/npm-whoami.md
+++ /dev/null
@@ -1,17 +0,0 @@
-npm-whoami(1) -- Display npm username
-=====================================
-
-## SYNOPSIS
-
- npm whoami [--registry ]
-
-## DESCRIPTION
-
-Print the `username` config to standard output.
-
-## SEE ALSO
-
-* npm-config(1)
-* npm-config(7)
-* npmrc(5)
-* npm-adduser(1)
diff --git a/deps/npm/doc/misc/npm-coding-style.md b/deps/npm/doc/misc/npm-coding-style.md
deleted file mode 100644
index 1199f63fcc3f03..00000000000000
--- a/deps/npm/doc/misc/npm-coding-style.md
+++ /dev/null
@@ -1,192 +0,0 @@
-npm-coding-style(7) -- npm's "funny" coding style
-=================================================
-
-## DESCRIPTION
-
-npm's coding style is a bit unconventional. It is not different for
-difference's sake, but rather a carefully crafted style that is
-designed to reduce visual clutter and make bugs more apparent.
-
-If you want to contribute to npm (which is very encouraged), you should
-make your code conform to npm's style.
-
-Note: this concerns npm's code not the specific packages that you can download from the npm registry.
-
-## Line Length
-
-Keep lines shorter than 80 characters. It's better for lines to be
-too short than to be too long. Break up long lists, objects, and other
-statements onto multiple lines.
-
-## Indentation
-
-Two-spaces. Tabs are better, but they look like hell in web browsers
-(and on GitHub), and node uses 2 spaces, so that's that.
-
-Configure your editor appropriately.
-
-## Curly braces
-
-Curly braces belong on the same line as the thing that necessitates them.
-
-Bad:
-
- function ()
- {
-
-Good:
-
- function () {
-
-If a block needs to wrap to the next line, use a curly brace. Don't
-use it if it doesn't.
-
-Bad:
-
- if (foo) { bar() }
- while (foo)
- bar()
-
-Good:
-
- if (foo) bar()
- while (foo) {
- bar()
- }
-
-## Semicolons
-
-Don't use them except in four situations:
-
-* `for (;;)` loops. They're actually required.
-* null loops like: `while (something) ;` (But you'd better have a good
- reason for doing that.)
-* `case 'foo': doSomething(); break`
-* In front of a leading `(` or `[` at the start of the line.
- This prevents the expression from being interpreted
- as a function call or property access, respectively.
-
-Some examples of good semicolon usage:
-
- ;(x || y).doSomething()
- ;[a, b, c].forEach(doSomething)
- for (var i = 0; i < 10; i ++) {
- switch (state) {
- case 'begin': start(); continue
- case 'end': finish(); break
- default: throw new Error('unknown state')
- }
- end()
- }
-
-Note that starting lines with `-` and `+` also should be prefixed
-with a semicolon, but this is much less common.
-
-## Comma First
-
-If there is a list of things separated by commas, and it wraps
-across multiple lines, put the comma at the start of the next
-line, directly below the token that starts the list. Put the
-final token in the list on a line by itself. For example:
-
- var magicWords = [ 'abracadabra'
- , 'gesundheit'
- , 'ventrilo'
- ]
- , spells = { 'fireball' : function () { setOnFire() }
- , 'water' : function () { putOut() }
- }
- , a = 1
- , b = 'abc'
- , etc
- , somethingElse
-
-## Quotes
-Use single quotes for strings except to avoid escaping.
-
-Bad:
-
- var notOk = "Just double quotes"
-
-Good:
-
- var ok = 'String contains "double" quotes'
- var alsoOk = "String contains 'single' quotes or apostrophe"
-
-## Whitespace
-
-Put a single space in front of `(` for anything other than a function call.
-Also use a single space wherever it makes things more readable.
-
-Don't leave trailing whitespace at the end of lines. Don't indent empty
-lines. Don't use more spaces than are helpful.
-
-## Functions
-
-Use named functions. They make stack traces a lot easier to read.
-
-## Callbacks, Sync/async Style
-
-Use the asynchronous/non-blocking versions of things as much as possible.
-It might make more sense for npm to use the synchronous fs APIs, but this
-way, the fs and http and child process stuff all uses the same callback-passing
-methodology.
-
-The callback should always be the last argument in the list. Its first
-argument is the Error or null.
-
-Be very careful never to ever ever throw anything. It's worse than useless.
-Just send the error message back as the first argument to the callback.
-
-## Errors
-
-Always create a new Error object with your message. Don't just return a
-string message to the callback. Stack traces are handy.
-
-## Logging
-
-Logging is done using the [npmlog](https://github.com/npm/npmlog)
-utility.
-
-Please clean up logs when they are no longer helpful. In particular,
-logging the same object over and over again is not helpful. Logs should
-report what's happening so that it's easier to track down where a fault
-occurs.
-
-Use appropriate log levels. See `npm-config(7)` and search for
-"loglevel".
-
-## Case, naming, etc.
-
-Use `lowerCamelCase` for multiword identifiers when they refer to objects,
-functions, methods, properties, or anything not specified in this section.
-
-Use `UpperCamelCase` for class names (things that you'd pass to "new").
-
-Use `all-lower-hyphen-css-case` for multiword filenames and config keys.
-
-Use named functions. They make stack traces easier to follow.
-
-Use `CAPS_SNAKE_CASE` for constants, things that should never change
-and are rarely used.
-
-Use a single uppercase letter for function names where the function
-would normally be anonymous, but needs to call itself recursively. It
-makes it clear that it's a "throwaway" function.
-
-## null, undefined, false, 0
-
-Boolean variables and functions should always be either `true` or
-`false`. Don't set it to 0 unless it's supposed to be a number.
-
-When something is intentionally missing or removed, set it to `null`.
-
-Don't set things to `undefined`. Reserve that value to mean "not yet
-set to anything."
-
-Boolean objects are forbidden.
-
-## SEE ALSO
-
-* npm-developers(7)
-* npm(1)
diff --git a/deps/npm/doc/misc/npm-index.md b/deps/npm/doc/misc/npm-index.md
deleted file mode 100644
index e6f9d1e49ce6f8..00000000000000
--- a/deps/npm/doc/misc/npm-index.md
+++ /dev/null
@@ -1,323 +0,0 @@
-npm-index(7) -- Index of all npm documentation
-==============================================
-
-### README(1)
-
-a JavaScript package manager
-
-## Command Line Documentation
-
-Using npm on the command line
-
-### npm(1)
-
-javascript package manager
-
-### npm-access(1)
-
-Set access level on published packages
-
-### npm-adduser(1)
-
-Add a registry user account
-
-### npm-audit(1)
-
-Run a security audit
-
-### npm-bin(1)
-
-Display npm bin folder
-
-### npm-bugs(1)
-
-Bugs for a package in a web browser maybe
-
-### npm-build(1)
-
-Build a package
-
-### npm-bundle(1)
-
-REMOVED
-
-### npm-cache(1)
-
-Manipulates packages cache
-
-### npm-ci(1)
-
-Install a project with a clean slate
-
-### npm-completion(1)
-
-Tab Completion for npm
-
-### npm-config(1)
-
-Manage the npm configuration files
-
-### npm-dedupe(1)
-
-Reduce duplication
-
-### npm-deprecate(1)
-
-Deprecate a version of a package
-
-### npm-dist-tag(1)
-
-Modify package distribution tags
-
-### npm-docs(1)
-
-Docs for a package in a web browser maybe
-
-### npm-doctor(1)
-
-Check your environments
-
-### npm-edit(1)
-
-Edit an installed package
-
-### npm-explore(1)
-
-Browse an installed package
-
-### npm-help-search(1)
-
-Search npm help documentation
-
-### npm-help(1)
-
-Get help on npm
-
-### npm-hook(1)
-
-Manage registry hooks
-
-### npm-init(1)
-
-create a package.json file
-
-### npm-install-ci-test(1)
-
-Install a project with a clean slate and run tests
-
-### npm-install-test(1)
-
-Install package(s) and run tests
-
-### npm-install(1)
-
-Install a package
-
-### npm-link(1)
-
-Symlink a package folder
-
-### npm-logout(1)
-
-Log out of the registry
-
-### npm-ls(1)
-
-List installed packages
-
-### npm-org(1)
-
-Manage orgs
-
-### npm-outdated(1)
-
-Check for outdated packages
-
-### npm-owner(1)
-
-Manage package owners
-
-### npm-pack(1)
-
-Create a tarball from a package
-
-### npm-ping(1)
-
-Ping npm registry
-
-### npm-prefix(1)
-
-Display prefix
-
-### npm-profile(1)
-
-Change settings on your registry profile
-
-### npm-prune(1)
-
-Remove extraneous packages
-
-### npm-publish(1)
-
-Publish a package
-
-### npm-rebuild(1)
-
-Rebuild a package
-
-### npm-repo(1)
-
-Open package repository page in the browser
-
-### npm-restart(1)
-
-Restart a package
-
-### npm-root(1)
-
-Display npm root
-
-### npm-run-script(1)
-
-Run arbitrary package scripts
-
-### npm-search(1)
-
-Search for packages
-
-### npm-shrinkwrap(1)
-
-Lock down dependency versions for publication
-
-### npm-star(1)
-
-Mark your favorite packages
-
-### npm-stars(1)
-
-View packages marked as favorites
-
-### npm-start(1)
-
-Start a package
-
-### npm-stop(1)
-
-Stop a package
-
-### npm-team(1)
-
-Manage organization teams and team memberships
-
-### npm-test(1)
-
-Test a package
-
-### npm-token(1)
-
-Manage your authentication tokens
-
-### npm-uninstall(1)
-
-Remove a package
-
-### npm-unpublish(1)
-
-Remove a package from the registry
-
-### npm-update(1)
-
-Update a package
-
-### npm-version(1)
-
-Bump a package version
-
-### npm-view(1)
-
-View registry info
-
-### npm-whoami(1)
-
-Display npm username
-
-## API Documentation
-
-Using npm in your Node programs
-
-## Files
-
-File system structures npm uses
-
-### npm-folders(5)
-
-Folder Structures Used by npm
-
-### npm-package-locks(5)
-
-An explanation of npm lockfiles
-
-### npm-shrinkwrap.json(5)
-
-A publishable lockfile
-
-### npmrc(5)
-
-The npm config files
-
-### package-lock.json(5)
-
-A manifestation of the manifest
-
-### package.json(5)
-
-Specifics of npm's package.json handling
-
-## Misc
-
-Various other bits and bobs
-
-### npm-coding-style(7)
-
-npm's "funny" coding style
-
-### npm-config(7)
-
-More than you probably want to know about npm configuration
-
-### npm-developers(7)
-
-Developer Guide
-
-### npm-disputes(7)
-
-Handling Module Name Disputes
-
-### npm-index(7)
-
-Index of all npm documentation
-
-### npm-orgs(7)
-
-Working with Teams & Orgs
-
-### npm-registry(7)
-
-The JavaScript Package Registry
-
-### npm-scope(7)
-
-Scoped packages
-
-### npm-scripts(7)
-
-How npm handles the "scripts" field
-
-### removing-npm(7)
-
-Cleaning the Slate
-
-### semver(7)
-
-The semantic versioner for npm
-
diff --git a/deps/npm/doc/spec/file-specifiers.md b/deps/npm/doc/spec/file-specifiers.md
deleted file mode 100644
index e737909db52579..00000000000000
--- a/deps/npm/doc/spec/file-specifiers.md
+++ /dev/null
@@ -1,151 +0,0 @@
-# `file:` specifiers
-
-`specifier` refers to the value part of the `package.json`'s `dependencies`
-object. This is a semver expression for registry dependencies and
-URLs and URL-like strings for other types.
-
-### Dependency Specifiers
-
-* A `file:` specifier is either an absolute path (eg `/path/to/thing`, `d:\path\to\thing`):
- * An absolute `file:///absolute/path` with any number of leading slashes
- being treated as a single slash. That is, `file:/foo/bar` and
- `file:///foo/bar` reference the same package.
-* … or a relative path (eg `../path/to/thing`, `path\to\subdir`). Leading
- slashes on a file specifier will be removed, that is 'file://../foo/bar`
- references the same package as same as `file:../foo/bar`. The latter is
- considered canonical.
-* Attempting to install a specifier that has a windows drive letter will
- produce an error on non-Windows systems.
-* A valid `file:` specifier points is:
- * a valid package file. That is, a `.tar`, `.tar.gz` or `.tgz` containing
- `/package.json`.
- * OR, a directory that contains a `package.json`
-
-Relative specifiers are relative to the file they were found in, or, if
-provided on the command line, the CWD that the command was run from.
-
-An absolute specifier found in a `package.json` or `npm-shrinkwrap.json` is
-probably an error as it's unlikely to be portable between computers and
-should warn.
-
-A specifier provided as a command line argument that is on a different drive
-is an error. That is, `npm install file:d:/foo/bar` is an error if the
-current drive is `c`. The point of this rule is that if we can't produce a
-relative path then it's an error.
-
-### Specifier Disambiguation
-
-On the command line, plain paths are allowed. These paths can be ambiguous
-as they could be a path, a plain package name or a github shortcut. This
-ambiguity is resolved by checking to see if either a directory exists that
-contains a `package.json`. If either is the case then the specifier is a
-file specifier, otherwise it's a registry or github specifier.
-
-### Specifier Matching
-
-A specifier is considered to match a dependency on disk when the `realpath`
-of the fully resolved specifier matches the `realpath` of the package on disk.
-
-### Saving File Specifiers
-
-When saving to both `package.json` and `npm-shrinkwrap.json` they will be
-saved using the `file:../relative/path` form, and the relative path will be
-relative to the project's root folder. This is particularly important to
-note for the `npm-shrinkwrap.json` as it means the specifier there will
-be different then the original `package.json` (where it was relative to that
-`package.json`).
-
-When shrinkwrapping file specifiers, the contents of the destination
-package's `node_modules` WILL NOT be included in the shrinkwrap. If you want to lock
-down the destination package's `node_modules` you should create a shrinkwrap for it
-separately.
-
-This is necessary to support the mono repo use case where many projects file
-to the same package. If each project included its own `npm-shrinkwrap.json`
-then they would each have their own distinct set of transitive dependencies
-and they'd step on each other any time you ran an install in one or the other.
-
-NOTE: This should not have an effect on shrinkwrapping of other sorts of
-shrinkwrapped packages.
-
-### Installation
-
-#### File type specifiers pointing at tarballs
-
-File-type specifiers pointing at a `.tgz` or `.tar.gz` or `.tar` file will
-install it as a package file in the same way we would a remote tarball. The
-checksum of the package file should be recorded so that we can check for updates.
-
-#### File type specifers pointing at directories
-
-File-type specifiers that point at directories will necessarily not do
-anything for `fetch` and `extract` phases.
-
-The symlink should be created during the `finalize` phase.
-
-The `preinstall` for file-type specifiers MUST be run AFTER the
-`finalize` phase as the symlink may be a relative path reaching outside the
-current project root and a symlink that resolves in `.staging` won't resolve
-in the package's final resting place.
-
-If the module is inside the package root that we're running the install for then
-dependencies of the linked package will be hoisted to the top level as usual.
-
-If the module is outside the package root then dependencies will be installed inside
-the linked module's `node_modules` folder.
-
-### Removal
-
-Removal should remove the symlink.
-
-Removal MUST NOT remove the transitive dependencies IF they're installed in
-the linked module's `node_modules` folder.
-
-### Listing
-
-In listings they should not include a version as the version is not
-something `npm` is concerned about. This also makes them easily
-distinguishable from symlinks of packages that have other dependency
-specifiers.
-
-If you had run:
-
-```
-npm install --save file:../a
-```
-
-And then run:
-```
-npm ls
-```
-
-You would see:
-
-```
-example-package@1.0.0 /path/to/example-package
-└── a → file:../a
-```
-
-```
-example-package@1.0.0 /path/to/example-package
-+-- a -> file:../a
-```
-
-Of note here: No version is included as the relevant detail is WHERE the
-package came from, not what version happened to be in that path.
-
-### Outdated
-
-Local specifiers should only show up in `npm outdated` if they're missing
-and when they do, they should be reported as:
-
-```
-Package Current Wanted Latest Location
-a MISSING LOCAL LOCAL example-package
-```
-
-### Updating
-
-If a dependency with a local specifier is already installed then `npm
-update` shouldn't do anything. If one is missing then it should be
-installed as if you ran `npm install`.
diff --git a/deps/npm/doc/spec/package-lock.md b/deps/npm/doc/spec/package-lock.md
deleted file mode 100644
index 87d5c223537cfe..00000000000000
--- a/deps/npm/doc/spec/package-lock.md
+++ /dev/null
@@ -1,294 +0,0 @@
-# package-lock and npm-shrinkwrap
-
-`npm` can have one of two different lock files:
-
-* `package-lock.json`, which is ordinarily always present and is never published.
-* `npm-shrinkwrap.json`, which is created with `npm shrinkwrap` and usually published.
-
-You can only have one of them and in the event that you have both,
-`npm-shrinkwrap.json` takes precedence. The files are exactly the same
-format and in fact all the `npm shrinkwrap` command does is rename your
-`package-lock.json`.
-
-Through the rest of this document we will refer to the package-lock and
-`package-lock.json` but everything also applies to `npm-shrinkwrap.json`.
-
-## File Format
-
-### name
-
-The name of the package this is a package-lock for. This must match what's in `package.json`.
-
-### version
-
-The version of the package this is a package-lock for. This must match what's in `package.json`.
-
-### lockfileVersion *(new)*
-
-An integer version, starting at `1` with the version number of this document
-whose semantics were used when generating this `package-lock.json`.
-
-### preserveSymlinks *(new)*
-
-Indicates that the install was done with the environment variable
-`NODE_PRESERVE_SYMLINKS` enabled. The installer should insist that the value of this
-property match that environment variable.
-
-### dependencies
-
-These are the modules installed in the `node_modules`. Some of these are
-dependencies some of these are transitive dependencies (that is,
-dependencies of our dependencies).
-
-This is a mapping of package name to dependency object. Dependency objects have the
-following properties:
-
-#### version *(changed)*
-
-This is a specifier that uniquely identifies this package and should be
-usable in fetching a new copy of it.
-
-* bundled dependencies: Regardless of source, this is a version number that is purely for informational purposes.
-* registry sources: This is a version number. (eg, `1.2.3`)
-* git sources: This is a git specifier with resolved committish. (eg, `git+https://example.com/foo/bar#115311855adb0789a0466714ed48a1499ffea97e`)
-* http tarball sources: This is the URL of the tarball. (eg, `https://example.com/example-1.3.0.tgz`)
-* local tarball sources: This is the file URL of the tarball. (eg `file:///opt/storage/example-1.3.0.tgz`)
-* local link sources: This is the file URL of the link. (eg `file:libs/our-module`)
-
-#### integrity *(new)*
-
-This is a [Standard Subresource
-Integrity](https://w3c.github.io/webappsec/specs/subresourceintegrity/) for
-this resource.
-
-* For bundled dependencies this is not included, regardless of source.
-* For registry sources, this is the `integrity` that the registry provided, or if one wasn't provided the SHA1 in `shasum`.
-* For git sources this is the specific commit hash we cloned from.
-* For remote tarball sources this is an integrity based on a SHA512 of
- the file.
-* For local tarball sources: This is an integrity field based on the SHA512 of the file.
-
-#### resolved
-
-* For bundled dependencies this is not included, regardless of source.
-* For registry sources this is path of the tarball relative to the registry
- URL. If the tarball URL isn't on the same server as the registry URL then
- this is a complete URL.
-
- eg, Given a `package-lock.json` file containing:
-
- ```
- "resolved": "https://registry.npmjs.org/example/-/example-1.0.0.tgz"
- ```
-
- and a registry source configuring a custom value:
-
- ```
- npm install --registry https://registry.example.com
- ```
-
- the package will be fetched from the custom-defined registry:
-
- ```
- https://registry.example.com/example/-/example-1.0.0.tgz
- ```
-
-#### link *(new)*
-
-If this module was symlinked in development but had semver in the
-`package.json` then this is the relative path of that link.
-
-Discussion of the semantics of this will go in the symlinks RFC.
-
-Implementation note: To be implemented post npm@5.
-
-#### bundled *(new)*
-
-If true, this is the bundled dependency and will be installed by the parent
-module. When installing, this module will be extracted from the parent
-module during the extract phase, not installed as a separate dependency.
-
-#### dev
-
-If true then this dependency is either a development dependency ONLY of the
-top level module or a transitive dependency of one. This is false for
-dependencies that are both a development dependency of the top level and a
-transitive dependency of a non-development dependency of the top level.
-
-#### optional
-
-If true then this dependency is either an optional dependency ONLY of the
-top level module or a transitive dependency of one. This is false for
-dependencies that are both an optional dependency of the top level and a
-transitive dependency of a non-optional dependency of the top level.
-
-All optional dependencies should be included even if they're uninstallable
-on the current platform.
-
-#### from
-
-This is a record of what specifier was used to originally install this
-package. This should be used only for git dependencies.
-
-#### requires
-
-This is a mapping of module name to version. This is a list of everything
-this module requires, regardless of where it will be installed. The version
-should match via normal matching rules a dependency either in our
-`dependencies` or in a level higher than us.
-
-#### dependencies
-
-Exactly like `dependencies` at the top level, this is a list of modules to
-install in the `node_modules` of this module.
-
-## Generating
-
-### `npm init`
-
-If neither a `package-lock.json` nor an `npm-shrinkwrap.json` exist then
-`npm init` will create a `package-lock.json`. This is functionally
-equivalent to running `npm shrinkwrap` after the current init completes and
-renaming the result to `package-lock.json`.
-
-### `npm install --save`
-
-If either an `npm-shrinkwrap.json` or a `package-lock.json` exists then it
-will be updated.
-
-If neither exist then a `package-lock.json` should be generated.
-
-If a `package.json` does not exist, it should be generated. The generated
-`package.json` should be empty, as in:
-
-```
-{
- "dependencies": {
- }
-}
-```
-
-If the user wants to get a default package name/version added they can run `npm init`.
-
-### `npm shrinkwrap`
-
-If a `package-lock.json` exists, rename it to `npm-shrinkwrap.json`.
-Refresh the data from the installer's ideal tree.
-
-The top level `name` and `version` come from the `package.json`. It is an
-error if either are missing or invalid.
-
-#### dependencies.dev
-
-This is `true` if this dependency is ONLY installed to fulfill either a top
-level development dependency, or one of its transitive dependencies.
-
-Given:
-```
-B (Dev) → C
-```
-
-Then both B and C would be `dev: true`.
-
-Given:
-```
-A → B → C
-B (Dev) -> C
-```
-
-Then all dependencies would be `dev: false`.
-
-#### dependencies.optional
-
-This is `true` if this dependency is ONLY ever either an optional dependency
-or a transitive dependency of optional dependencies.
-
-Given:
-```
-A (Opt) → B → C
-```
-
-Then all three of A, B and C would be flagged as optional.
-
-Given:
-```
-A (Opt) → B → C
-D → C
-```
-
-Then A and B would be flagged as optional, but C would not be.
-
-Given:
-```
-A (Opt) → B → C
-D → A
-```
-
-Then none would be flagged as optional.
-
-## Installing
-
-If the `packageIntegrity` in the `package-lock.json` differs from the one
-computed from the `package.json` then places where the `package.json` is
-incompatible with the `package-lock.json` a new module should be installed.
-That is, while the `package-lock.json` ordinarily defines the state of your
-project, if your `package.json` is edited independently it will take
-precedence.
-
-The `package-lock.json` describes the exact tree that `npm` should create.
-Any deviation between the `package.json` and the shrinkwrap/lock should
-result in a warning be issued. This includes:
-
-* Modules in `package.json` but missing from the `package-lock.json`
-* Modules in the `package-lock.json` but missing from the `package.json`.
-* Modules in `package.json` whose specifiers don't match the version in `package-lock.json`.
-
-Warn if the `lockfileVersion` in the `package-lock.json` is for a different
-major version than we implement.
-
-Module resolution from package-lock data works as such:
-
-* If install was run with `--resolve-links` and a dependency has a `link`
- property then a symlink is made using that. If the version of the
- destination can not be matched to the package-lock and/or the package.json
- then a warning will be issued.
-
-* Otherwise, if a `integrity` is available then we try to install it from the cache using it.
-
-If `integrity` is unavailable or we are unable to locate a module from the `integrity` then:
-
-* If `lockfileVersion` is set:
- * Install using the value of `version` and validate the result against the
- `integrity`.
-* Otherwise, try these in turn and validate the result against the `integrity`:
- * `resolved`, then `from`, then `version.
- * `from` can be either `package@specifier` or just `specifier`.
-
-Regardless of how the module is installed the metadata in the installed
-module should be identical to what it would have been if the module were
-installed w/o a package-lock.
-
-## Implied Changes To Other Commands
-
-### `npm rm --save`
-
-Currently if you ask to remove a package that's both a direct and a
-transitive dependency, we'll remove the package from `node_modules` even if
-this results in a broken tree. This was chosen at the time because we felt
-that users would expect `npm rm pkgname` to be equivalent of
-`rm -rf node_modules/pkgname`.
-
-As you are no longer going to be allowed to put your `node_modules` in a
-state that's not a valid package-lock, this means this behavior is no longer
-valid. Instead we should follow normal rules, removing it from the
-dependencies for the top level but only removing the module on disk if
-nothing requires it any more.
-
-## Additional fields / Adding new fields
-
-Installers should ignore any field they aren't aware of. It's not an error
-to have additional properties in the package-lock or lock file.
-
-Installers that want to add new fields should either have one added via RFC
-in the npm issue tracker and an accompanying documentation PR, or should prefix
-it with the name of their project.
diff --git a/deps/npm/docs/LICENSE b/deps/npm/docs/LICENSE
new file mode 100644
index 00000000000000..5169a5e4135e9f
--- /dev/null
+++ b/deps/npm/docs/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 gatsbyjs
+
+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/deps/npm/doc/cli/npm-access.md b/deps/npm/docs/content/cli-commands/npm-access.md
similarity index 74%
rename from deps/npm/doc/cli/npm-access.md
rename to deps/npm/docs/content/cli-commands/npm-access.md
index aeea0178ec66d7..0fbce9c0759d12 100644
--- a/deps/npm/doc/cli/npm-access.md
+++ b/deps/npm/docs/content/cli-commands/npm-access.md
@@ -1,22 +1,31 @@
-npm-access(1) -- Set access level on published packages
-=======================================================
+---
+section: cli-commands
+title: npm-access
+description: Set access level on published packages
+---
-## SYNOPSIS
+# npm-access(1)
- npm access public []
- npm access restricted []
+## Set access level on published packages
- npm access grant []
- npm access revoke []
+### Synopsis
- npm access 2fa-required []
- npm access 2fa-not-required []
+```bash
+npm access public []
+npm access restricted []
- npm access ls-packages [||]
- npm access ls-collaborators [ []]
- npm access edit []
+npm access grant []
+npm access revoke []
-## DESCRIPTION
+npm access 2fa-required []
+npm access 2fa-not-required []
+
+npm access ls-packages [||]
+npm access ls-collaborators [ []]
+npm access edit []
+```
+
+### Description
Used to set access controls on private packages.
@@ -48,7 +57,7 @@ subcommand.
* edit:
Set the access privileges for a package at once using `$EDITOR`.
-## DETAILS
+### Details
`npm access` always operates directly on the current registry, configurable
from the command line using `--registry=`.
@@ -75,10 +84,10 @@ with an HTTP 402 status code (logically enough), unless you use
Management of teams and team memberships is done with the `npm team` command.
-## SEE ALSO
+### See Also
* [`libnpmaccess`](https://npm.im/libnpmaccess)
-* npm-team(1)
-* npm-publish(1)
-* npm-config(7)
-* npm-registry(7)
+* [npm team](/cli-commands/npm-team)
+* [npm publish](/cli-commands/npm-publish)
+* [npm config](/cli-commands/npm-config)
+* [npm registry](/using-npm/registry)
diff --git a/deps/npm/doc/cli/npm-adduser.md b/deps/npm/docs/content/cli-commands/npm-adduser.md
similarity index 66%
rename from deps/npm/doc/cli/npm-adduser.md
rename to deps/npm/docs/content/cli-commands/npm-adduser.md
index 72433e00f74832..2df35e45fc550e 100644
--- a/deps/npm/doc/cli/npm-adduser.md
+++ b/deps/npm/docs/content/cli-commands/npm-adduser.md
@@ -1,17 +1,26 @@
-npm-adduser(1) -- Add a registry user account
-=============================================
+ ---
+section: cli-commands
+title: npm-adduser
+description: Set access level on published packages
+---
-## SYNOPSIS
+# npm-adduser(1)
- npm adduser [--registry=url] [--scope=@orgname] [--always-auth] [--auth-type=legacy]
+## Add a registry user account
- aliases: login, add-user
+### Synopsis
-## DESCRIPTION
+```bash
+npm adduser [--registry=url] [--scope=@orgname] [--always-auth] [--auth-type=legacy]
+
+aliases: login, add-user
+```
+
+### Description
Create or verify a user named `` in the specified registry, and
save the credentials to the `.npmrc` file. If no registry is specified,
-the default registry will be used (see `npm-config(7)`).
+the default registry will be used (see [`config`](/using-npm/config)).
The username, password, and email are read in from prompts.
@@ -26,30 +35,32 @@ your existing record.
`npm login` is an alias to `adduser` and behaves exactly the same way.
-## CONFIGURATION
+### Configuration
-### registry
+#### registry
Default: https://registry.npmjs.org/
The base URL of the npm package registry. If `scope` is also specified,
this registry will only be used for packages with that scope. `scope` defaults
-to the scope of the project directory you're currently in, if any. See `npm-scope(7)`.
+to the scope of the project directory you're currently in, if any. See [`scope`](/using-npm/scope).
-### scope
+#### scope
Default: none
If specified, the user and login credentials given will be associated
-with the specified scope. See `npm-scope(7)`. You can use both at the same time,
+with the specified scope. See [`scope`](/using-npm/scope). You can use both at the same time,
e.g.
+```bash
npm adduser --registry=http://myregistry.example.com --scope=@myco
+```
This will set a registry for the given scope and login or create a user for
that registry at the same time.
-### always-auth
+#### always-auth
Default: false
@@ -57,16 +68,16 @@ If specified, save configuration indicating that all requests to the given
registry should include authorization information. Useful for private
registries. Can be used with `--registry` and / or `--scope`, e.g.
+```bash
npm adduser --registry=http://private-registry.example.com --always-auth
+```
This will ensure that all requests to that registry (including for tarballs)
include an authorization header. This setting may be necessary for use with
private registries where metadata and package tarballs are stored on hosts with
-different hostnames. See `always-auth` in `npm-config(7)` for more details on
-always-auth. Registry-specific configuration of `always-auth` takes precedence
-over any global configuration.
+different hostnames. See `always-auth` in [`config`](/using-npm/config) for more details on always-auth. Registry-specific configuration of `always-auth` takes precedence over any global configuration.
-### auth-type
+#### auth-type
* Default: `'legacy'`
* Type: `'legacy'`, `'sso'`, `'saml'`, `'oauth'`
@@ -75,11 +86,10 @@ What authentication strategy to use with `adduser`/`login`. Some npm registries
(for example, npmE) might support alternative auth strategies besides classic
username/password entry in legacy npm.
-## SEE ALSO
+### See Also
-* npm-registry(7)
-* npm-config(1)
-* npm-config(7)
-* npmrc(5)
-* npm-owner(1)
-* npm-whoami(1)
+* [npm registry](/using-npm/registry)
+* [npm config](/cli-commands/npm-config)
+* [npmrc](/configuring-npm/npmrc)
+* [npm owner](/cli-commands/npm-owner)
+* [npm whoami](/cli-commands/npm-whoami)
diff --git a/deps/npm/doc/cli/npm-audit.md b/deps/npm/docs/content/cli-commands/npm-audit.md
similarity index 85%
rename from deps/npm/doc/cli/npm-audit.md
rename to deps/npm/docs/content/cli-commands/npm-audit.md
index 10039ea09cbc1d..0aba874f96df8d 100644
--- a/deps/npm/doc/cli/npm-audit.md
+++ b/deps/npm/docs/content/cli-commands/npm-audit.md
@@ -1,73 +1,82 @@
-npm-audit(1) -- Run a security audit
-====================================
+---
+section: cli-commands
+title: npm-audit
+description: Run a security audit
+---
-## SYNOPSIS
+# npm-audit(1)
- npm audit [--json|--parseable|--audit-level=(low|moderate|high|critical)]
- npm audit fix [--force|--package-lock-only|--dry-run]
+## Run a security audit
- common options: [--production] [--only=(dev|prod)]
+### Synopsis
-## EXAMPLES
+```bash
+npm audit [--json|--parseable|--audit-level=(low|moderate|high|critical)]
+npm audit fix [--force|--package-lock-only|--dry-run]
+
+common options: [--production] [--only=(dev|prod)]
+```
+
+### Examples
Scan your project for vulnerabilities and automatically install any compatible
updates to vulnerable dependencies:
-```
+```bash
$ npm audit fix
```
Run `audit fix` without modifying `node_modules`, but still updating the
pkglock:
-```
+```bash
$ npm audit fix --package-lock-only
```
Skip updating `devDependencies`:
-```
+```bash
$ npm audit fix --only=prod
```
Have `audit fix` install semver-major updates to toplevel dependencies, not just
semver-compatible ones:
-```
+```bash
$ npm audit fix --force
```
Do a dry run to get an idea of what `audit fix` will do, and _also_ output
install information in JSON format:
-```
+```bash
$ npm audit fix --dry-run --json
```
Scan your project for vulnerabilities and just show the details, without fixing
anything:
-```
+```bash
$ npm audit
```
Get the detailed audit report in JSON format:
-```
+```bash
$ npm audit --json
```
Get the detailed audit report in plain text result, separated by tab characters, allowing for
future reuse in scripting or command line post processing, like for example, selecting
some of the columns printed:
-```
+```bash
$ npm audit --parseable
```
To parse columns, you can use for example `awk`, and just print some of them:
-```
+```bash
$ npm audit --parseable | awk -F $'\t' '{print $1,$4}'
```
Fail an audit only if the results include a vulnerability with a level of moderate or higher:
-```
+```bash
$ npm audit --audit-level=moderate
```
-## DESCRIPTION
+### Description
The audit command submits a description of the dependencies configured in
your project to your default registry and asks for a report of known
@@ -88,7 +97,7 @@ to specify the minimum vulnerability level that will cause the command to fail.
option does not filter the report output, it simply changes the command's failure
threshold.
-## CONTENT SUBMITTED
+### Content Submitted
* npm_version
* node_version
@@ -96,7 +105,7 @@ threshold.
* node_env
* A scrubbed version of your package-lock.json or npm-shrinkwrap.json
-### SCRUBBING
+#### Scrubbing
In order to ensure that potentially sensitive information is not included in
the audit data bundle, some dependencies may have their names (and sometimes
@@ -113,15 +122,15 @@ The non-reversible identifiers are a sha256 of a session-specific UUID and the
value being replaced, ensuring a consistent value within the payload that is
different between runs.
-## EXIT CODE
+### Exit Code
The `npm audit` command will exit with a 0 exit code if no vulnerabilities were found.
If vulnerabilities were found the exit code will depend on the `audit-level`
configuration setting.
-## SEE ALSO
+### See Also
-* npm-install(1)
-* package-locks(5)
-* config(7)
+* [npm install](/cli-commands/npm-install)
+* [package-locks](/configuring-npm/package-locks)
+* [config](/using-npm/config)
diff --git a/deps/npm/docs/content/cli-commands/npm-bin.md b/deps/npm/docs/content/cli-commands/npm-bin.md
new file mode 100644
index 00000000000000..6c7ce0eee54e21
--- /dev/null
+++ b/deps/npm/docs/content/cli-commands/npm-bin.md
@@ -0,0 +1,26 @@
+---
+section: cli-commands
+title: npm-bin
+description: Display npm bin folder
+---
+
+# npm-bin(1)
+
+## Display npm bin folder
+
+### Synopsis
+```bash
+npm bin [-g|--global]
+```
+
+### Description
+
+Print the folder where npm will install executables.
+
+### See Also
+
+* [npm prefix](/cli-commands/npm-prefix)
+* [npm root](/cli-commands/npm-root)
+* [npm folders](/configuring-npm/folders)
+* [npm config](/cli-commands/npm-config)
+* [npmrc](/configuring-npm/npmrc)
diff --git a/deps/npm/docs/content/cli-commands/npm-bugs.md b/deps/npm/docs/content/cli-commands/npm-bugs.md
new file mode 100644
index 00000000000000..dcc9c358df14d8
--- /dev/null
+++ b/deps/npm/docs/content/cli-commands/npm-bugs.md
@@ -0,0 +1,50 @@
+---
+section: cli-commands
+title: npm-bugs
+description: Bugs for a package in a web browser maybe
+---
+
+# npm-bugs(1)
+
+## Bugs for a package in a web browser maybe
+
+### Synopsis
+```bash
+npm bugs []
+
+aliases: issues
+```
+
+### Description
+
+This command tries to guess at the likely location of a package's
+bug tracker URL, and then tries to open it using the `--browser`
+config param. If no package name is provided, it will search for
+a `package.json` in the current folder and use the `name` property.
+
+### Configuration
+
+#### browser
+
+* Default: OS X: `"open"`, Windows: `"start"`, Others: `"xdg-open"`
+* Type: String
+
+The browser that is called by the `npm bugs` command to open websites.
+
+#### registry
+
+* Default: https://registry.npmjs.org/
+* Type: url
+
+The base URL of the npm package registry.
+
+
+### See Also
+
+* [npm docs](/cli-commands/npm-docs)
+* [npm view](/cli-commands/npm-view)
+* [npm publish](/cli-commands/npm-publish)
+* [npm registry](/using-npm/registry)
+* [npm config](/cli-commands/npm-config)
+* [npmrc](/configuring-npm/npmrc)
+* [package.json](/configuring-npm/package-json)
diff --git a/deps/npm/docs/content/cli-commands/npm-build.md b/deps/npm/docs/content/cli-commands/npm-build.md
new file mode 100644
index 00000000000000..b657129787663d
--- /dev/null
+++ b/deps/npm/docs/content/cli-commands/npm-build.md
@@ -0,0 +1,34 @@
+---
+section: cli-commands
+title: npm-build
+description: Build a package
+---
+
+# npm-build(1)
+
+## Build a package
+
+### Synopsis
+```shell
+npm build []
+```
+
+* ``:
+ A folder containing a `package.json` file in its root.
+
+### Description
+
+This is the plumbing command called by `npm link` and `npm install`.
+
+It should generally be called during installation, but if you need to run it
+directly, run:
+```bash
+ npm run-script build
+```
+
+### See Also
+
+* [npm install](/cli-commands/npm-install)
+* [npm link](/cli-commands/npm-link)
+* [npm scripts](/using-npm/scripts)
+* [package.json](/configuring-npm/package-json)
diff --git a/deps/npm/doc/cli/npm-bundle.md b/deps/npm/docs/content/cli-commands/npm-bundle.md
similarity index 58%
rename from deps/npm/doc/cli/npm-bundle.md
rename to deps/npm/docs/content/cli-commands/npm-bundle.md
index 69b3d83e458d7e..76417ac8b0b0c7 100644
--- a/deps/npm/doc/cli/npm-bundle.md
+++ b/deps/npm/docs/content/cli-commands/npm-bundle.md
@@ -1,7 +1,14 @@
-npm-bundle(1) -- REMOVED
-========================
+---
+section: cli-commands
+title: npm-bundle
+description: REMOVED
+---
-## DESCRIPTION
+# npm-bundle(1)
+
+## REMOVED
+
+### Description
The `npm bundle` command has been removed in 1.0, for the simple reason
that it is no longer necessary, as the default behavior is now to
@@ -9,6 +16,6 @@ install packages into the local space.
Just use `npm install` now to do what `npm bundle` used to do.
-## SEE ALSO
+### See Also
-* npm-install(1)
+* [npm install](/cli-commands/npm-install)
diff --git a/deps/npm/doc/cli/npm-cache.md b/deps/npm/docs/content/cli-commands/npm-cache.md
similarity index 75%
rename from deps/npm/doc/cli/npm-cache.md
rename to deps/npm/docs/content/cli-commands/npm-cache.md
index 92a6236c0c9e90..ed31a320421b0c 100644
--- a/deps/npm/doc/cli/npm-cache.md
+++ b/deps/npm/docs/content/cli-commands/npm-cache.md
@@ -1,19 +1,28 @@
-npm-cache(1) -- Manipulates packages cache
-==========================================
+---
+section: cli-commands
+title: npm-cache
+description: Manipulates packages cache
+---
-## SYNOPSIS
+# npm-cache(1)
- npm cache add
- npm cache add
- npm cache add
- npm cache add @
+## Manipulates packages cache
- npm cache clean []
- aliases: npm cache clear, npm cache rm
+### Synopsis
- npm cache verify
+```bash
+npm cache add
+npm cache add
+npm cache add
+npm cache add @
-## DESCRIPTION
+npm cache clean []
+aliases: npm cache clear, npm cache rm
+
+npm cache verify
+```
+
+### Description
Used to add, list, or clean the npm cache folder.
@@ -29,7 +38,7 @@ Used to add, list, or clean the npm cache folder.
Verify the contents of the cache folder, garbage collecting any unneeded data,
and verifying the integrity of the cache index and all cached data.
-## DETAILS
+### Details
npm stores cache data in an opaque directory within the configured `cache`,
named `_cacache`. This directory is a `cacache`-based content-addressable cache
@@ -51,7 +60,7 @@ directly.
npm will not remove data by itself: the cache will grow as new packages are
installed.
-## A NOTE ABOUT THE CACHE'S DESIGN
+### A note about the cache's design
The npm cache is strictly a cache: it should not be relied upon as a persistent
and reliable data store for package data. npm makes no guarantee that a
@@ -62,22 +71,21 @@ if it does return data, that data will be exactly the data that was inserted.
To run an offline verification of existing cache contents, use `npm cache
verify`.
-## CONFIGURATION
+### Configuration
-### cache
+#### cache
Default: `~/.npm` on Posix, or `%AppData%/npm-cache` on Windows.
The root cache folder.
-## SEE ALSO
+### See Also
-* npm-folders(5)
-* npm-config(1)
-* npm-config(7)
-* npmrc(5)
-* npm-install(1)
-* npm-publish(1)
-* npm-pack(1)
+* [npm folders](/configuring-npm/folders)
+* [npm config](/cli-commands/npm-config)
+* [npmrc](/configuring-npm/npmrc)
+* [npm install](/cli-commands/npm-install)
+* [npm publish](/cli-commands/npm-publish)
+* [npm pack](/cli-commands/npm-pack)
* https://npm.im/cacache
* https://npm.im/pacote
diff --git a/deps/npm/doc/cli/npm-ci.md b/deps/npm/docs/content/cli-commands/npm-ci.md
similarity index 77%
rename from deps/npm/doc/cli/npm-ci.md
rename to deps/npm/docs/content/cli-commands/npm-ci.md
index 289bb7c195a9ee..357ba16cf6ade1 100644
--- a/deps/npm/doc/cli/npm-ci.md
+++ b/deps/npm/docs/content/cli-commands/npm-ci.md
@@ -1,15 +1,23 @@
-npm-ci(1) -- Install a project with a clean slate
-===================================
+---
+section: cli-commands
+title: npm-ci
+description: Install a project with a clean slate
+---
-## SYNOPSIS
+# npm-ci(1)
- npm ci
+## Install a project with a clean slate
-## EXAMPLE
+### Synopsis
+```bash
+npm ci
+```
+
+### Example
Make sure you have a package-lock and an up-to-date install:
-```
+```bash
$ cd ./my/npm/project
$ npm install
added 154 packages in 10s
@@ -18,14 +26,14 @@ $ ls | grep package-lock
Run `npm ci` in that project
-```
+```bash
$ npm ci
added 154 packages in 5s
```
Configure Travis to build using `npm ci` instead of `npm install`:
-```
+```bash
# .travis.yml
install:
- npm ci
@@ -35,9 +43,9 @@ cache:
- "$HOME/.npm"
```
-## DESCRIPTION
+### Description
-This command is similar to `npm-install(1)`, except it's meant to be used in
+This command is similar to [`npm install`](/cli-commands/npm-install), except it's meant to be used in
automated environments such as test platforms, continuous integration, and
deployment -- or any situation where you want to make sure you're doing a clean
install of your dependencies. It can be significantly faster than a regular npm
@@ -53,7 +61,7 @@ In short, the main differences between using `npm install` and `npm ci` are:
* If a `node_modules` is already present, it will be automatically removed before `npm ci` begins its install.
* It will never write to `package.json` or any of the package-locks: installs are essentially frozen.
-## SEE ALSO
+### See Also
-* npm-install(1)
-* npm-package-locks(5)
+* [npm install](/cli-commands/npm-install)
+* [package-locks](/configuring-npm/package-locks)
diff --git a/deps/npm/doc/cli/npm-completion.md b/deps/npm/docs/content/cli-commands/npm-completion.md
similarity index 56%
rename from deps/npm/doc/cli/npm-completion.md
rename to deps/npm/docs/content/cli-commands/npm-completion.md
index 1c675d96021833..59bfca503e0846 100644
--- a/deps/npm/doc/cli/npm-completion.md
+++ b/deps/npm/docs/content/cli-commands/npm-completion.md
@@ -1,11 +1,19 @@
-npm-completion(1) -- Tab Completion for npm
-===========================================
+---
+section: cli-commands
+title: npm-completion
+description: Tab Completion for npm
+---
-## SYNOPSIS
+# npm-completion(1)
- source <(npm completion)
+## Tab Completion for npm
-## DESCRIPTION
+### Synopsis
+```bash
+source <(npm completion)
+```
+
+### Description
Enables tab-completion in all npm commands.
@@ -14,19 +22,21 @@ loads the completions into your current shell. Adding it to
your ~/.bashrc or ~/.zshrc will make the completions available
everywhere:
- npm completion >> ~/.bashrc
- npm completion >> ~/.zshrc
+```bash
+npm completion >> ~/.bashrc
+npm completion >> ~/.zshrc
+```
You may of course also pipe the output of `npm completion` to a file
-such as `/usr/local/etc/bash_completion.d/npm` or
-`/etc/bash_completion.d/npm` if you have a system that will read
+such as `/usr/local/etc/bash_completion.d/npm` or
+`/etc/bash_completion.d/npm` if you have a system that will read
that file for you.
When `COMP_CWORD`, `COMP_LINE`, and `COMP_POINT` are defined in the
environment, `npm completion` acts in "plumbing mode", and outputs
completions based on the arguments.
-## SEE ALSO
+### See Also
-* npm-developers(7)
-* npm(1)
+* [npm developers](/using-npm/developers)
+* [npm](/cli-commands/npm)
diff --git a/deps/npm/docs/content/cli-commands/npm-config.md b/deps/npm/docs/content/cli-commands/npm-config.md
new file mode 100644
index 00000000000000..c2f2033b066d29
--- /dev/null
+++ b/deps/npm/docs/content/cli-commands/npm-config.md
@@ -0,0 +1,85 @@
+---
+section: cli-commands
+title: npm-config
+description: Manage the npm configuration files
+---
+
+# npm-config(1)
+
+## Manage the npm configuration files
+
+### Synopsis
+```bash
+npm config set [-g|--global]
+npm config get
+npm config delete
+npm config list [-l] [--json]
+npm config edit
+npm get
+npm set [-g|--global]
+
+aliases: c
+```
+
+### Description
+
+npm gets its config settings from the command line, environment
+variables, `npmrc` files, and in some cases, the `package.json` file.
+
+See [npmrc](/configuring-npm/npmrc) for more information about the npmrc files.
+
+See [config](/using-npm/config) for a more thorough discussion of the mechanisms
+involved.
+
+The `npm config` command can be used to update and edit the contents
+of the user and global npmrc files.
+
+### Sub-commands
+
+Config supports the following sub-commands:
+
+#### set
+```bash
+npm config set key value
+```
+Sets the config key to the value.
+
+If value is omitted, then it sets it to "true".
+
+#### get
+```bash
+npm config get key
+```
+
+Echo the config value to stdout.
+
+#### list
+```bash
+npm config list
+```
+
+Show all the config settings. Use `-l` to also show defaults. Use `--json`
+to show the settings in json format.
+
+#### delete
+```bash
+npm config delete key
+```
+
+Deletes the key from all configuration files.
+
+#### edit
+```bash
+npm config edit
+```
+
+Opens the config file in an editor. Use the `--global` flag to edit the
+global config.
+
+### See Also
+
+* [npm folders](/configuring-npm/folders)
+* [npm config](/cli-commands/npm-config)
+* [package.json](/configuring-npm/package-json)
+* [npmrc](/configuring-npm/npmrc)
+* [npm](/cli-commands/npm)
diff --git a/deps/npm/doc/cli/npm-dedupe.md b/deps/npm/docs/content/cli-commands/npm-dedupe.md
similarity index 64%
rename from deps/npm/doc/cli/npm-dedupe.md
rename to deps/npm/docs/content/cli-commands/npm-dedupe.md
index d68832145f0a56..e15a12ba7c18a3 100644
--- a/deps/npm/doc/cli/npm-dedupe.md
+++ b/deps/npm/docs/content/cli-commands/npm-dedupe.md
@@ -1,14 +1,22 @@
-npm-dedupe(1) -- Reduce duplication
-===================================
+---
+section: cli-commands
+title: npm-dedupe
+description: Reduce duplication
+---
-## SYNOPSIS
+# npm-dedupe(1)
- npm dedupe
- npm ddp
+## Reduce duplication
- aliases: find-dupes, ddp
+### Synopsis
+```bash
+npm dedupe
+npm ddp
-## DESCRIPTION
+aliases: find-dupes, ddp
+```
+
+### Description
Searches the local package tree and attempts to simplify the overall
structure by moving dependencies further up the tree, where they can
@@ -16,18 +24,22 @@ be more effectively shared by multiple dependent packages.
For example, consider this dependency graph:
- a
- +-- b <-- depends on c@1.0.x
- | `-- c@1.0.3
- `-- d <-- depends on c@~1.0.9
- `-- c@1.0.10
+```bash
+a
++-- b <-- depends on c@1.0.x
+| `-- c@1.0.3
+`-- d <-- depends on c@~1.0.9
+ `-- c@1.0.10
+```
-In this case, `npm-dedupe(1)` will transform the tree to:
+In this case, `npm dedupe` will transform the tree to:
- a
- +-- b
- +-- d
- `-- c@1.0.10
+```bash
+a
++-- b
++-- d
+`-- c@1.0.10
+```
Because of the hierarchical nature of node's module lookup, b and d
will both get their dependency met by the single c package at the root
@@ -48,8 +60,8 @@ Modules
Note that this operation transforms the dependency tree, but will never
result in new modules being installed.
-## SEE ALSO
+### See Also
-* npm-ls(1)
-* npm-update(1)
-* npm-install(1)
+* [npm ls](/cli-commands/npm-ls)
+* [npm update](/cli-commands/npm-update)
+* [npm install](/cli-commands/npm-install)
diff --git a/deps/npm/doc/cli/npm-deprecate.md b/deps/npm/docs/content/cli-commands/npm-deprecate.md
similarity index 53%
rename from deps/npm/doc/cli/npm-deprecate.md
rename to deps/npm/docs/content/cli-commands/npm-deprecate.md
index ea1ab3a2aef52d..d2d9613f653c6c 100644
--- a/deps/npm/doc/cli/npm-deprecate.md
+++ b/deps/npm/docs/content/cli-commands/npm-deprecate.md
@@ -1,28 +1,36 @@
-npm-deprecate(1) -- Deprecate a version of a package
-====================================================
+---
+section: cli-commands
+title: npm-deprecate
+description: Deprecate a version of a package
+---
+# npm-deprecate(1)
-## SYNOPSIS
+## Deprecate a version of a package
- npm deprecate [@]
+### Synopsis
+```bash
+npm deprecate [@]
+```
-## DESCRIPTION
+### Description
This command will update the npm registry entry for a package, providing
a deprecation warning to all who attempt to install it.
-It works on [version ranges](https://semver.npmjs.com/) as well as specific
+It works on [version ranges](https://semver.npmjs.com/) as well as specific
versions, so you can do something like this:
-
- npm deprecate my-thing@"< 0.2.3" "critical bug fixed in v0.2.3"
+```bash
+npm deprecate my-thing@"< 0.2.3" "critical bug fixed in v0.2.3"
+```
Note that you must be the package owner to deprecate something. See the
`owner` and `adduser` help topics.
-To un-deprecate a package, specify an empty string (`""`) for the `message`
-argument. Note that you must use double quotes with no space between them to
+To un-deprecate a package, specify an empty string (`""`) for the `message`
+argument. Note that you must use double quotes with no space between them to
format an empty string.
-## SEE ALSO
+### See Also
-* npm-publish(1)
-* npm-registry(7)
+* [npm publish](/cli-commands/npm-publish)
+* [npm registry](/using-npm/registry)
diff --git a/deps/npm/doc/cli/npm-dist-tag.md b/deps/npm/docs/content/cli-commands/npm-dist-tag.md
similarity index 75%
rename from deps/npm/doc/cli/npm-dist-tag.md
rename to deps/npm/docs/content/cli-commands/npm-dist-tag.md
index 7de3c828fb215b..c7921c7f739d72 100644
--- a/deps/npm/doc/cli/npm-dist-tag.md
+++ b/deps/npm/docs/content/cli-commands/npm-dist-tag.md
@@ -1,15 +1,24 @@
-npm-dist-tag(1) -- Modify package distribution tags
-===================================================
+ ---
+section: cli-commands
+title: npm-dist-tag
+description: Modify package distribution tags
+---
-## SYNOPSIS
+# npm-dist-tag(1)
- npm dist-tag add @ []
- npm dist-tag rm
- npm dist-tag ls []
+## Modify package distribution tags
- aliases: dist-tags
-## DESCRIPTION
+### Synopsis
+```bash
+npm dist-tag add @ []
+npm dist-tag rm
+npm dist-tag ls []
+
+aliases: dist-tags
+```
+
+### Description
Add, remove, and enumerate distribution tags on a package:
@@ -24,18 +33,20 @@ Add, remove, and enumerate distribution tags on a package:
* ls:
Show all of the dist-tags for a package, defaulting to the package in
- the current prefix.
-
- This is the default action if none is specified.
+ the current prefix. This is the default action if none is specified.
A tag can be used when installing packages as a reference to a version instead
of using a specific version number:
- npm install @
+```bash
+npm install @
+```
When installing dependencies, a preferred tagged version may be specified:
- npm install --tag
+```bash
+npm install --tag
+```
This also applies to `npm dedupe`.
@@ -45,7 +56,7 @@ Publishing a package sets the `latest` tag to the published version unless the
By default, `npm install ` (without any `@` or `@`
specifier) installs the `latest` tag.
-## PURPOSE
+### Purpose
Tags can be used to provide an alias instead of version numbers.
@@ -64,7 +75,7 @@ The `next` tag is used by some projects to identify the upcoming version.
By default, other than `latest`, no tag has any special significance to npm
itself.
-## CAVEATS
+### Caveats
This command used to be known as `npm tag`, which only created new tags, and so
had a different syntax.
@@ -79,12 +90,11 @@ example, `v1.4` cannot be used as a tag, because it is interpreted by semver as
The simplest way to avoid semver problems with tags is to use tags that do not
begin with a number or the letter `v`.
-## SEE ALSO
+### See Also
-* npm-publish(1)
-* npm-install(1)
-* npm-dedupe(1)
-* npm-registry(7)
-* npm-config(1)
-* npm-config(7)
-* npmrc(5)
+* [npm publish](/cli-commands/npm-publish)
+* [npm install](/cli-commands/npm-install)
+* [npm dedupe](/cli-commands/npm-dedupe)
+* [npm registry](/using-npm/registry)
+* [npm config](/cli-commands/npm-config)
+* [npmrc](/configuring-npm/npmrc)
diff --git a/deps/npm/docs/content/cli-commands/npm-docs.md b/deps/npm/docs/content/cli-commands/npm-docs.md
new file mode 100644
index 00000000000000..46f5cd0d900a47
--- /dev/null
+++ b/deps/npm/docs/content/cli-commands/npm-docs.md
@@ -0,0 +1,52 @@
+---
+section: cli-commands
+title: npm-docs
+description: Docs for a package in a web browser maybe
+---
+
+# npm-docs(1)
+
+## Docs for a package in a web browser maybe
+
+### Synopsis
+
+```bash
+npm docs [ [ ...]]
+npm docs .
+npm home [ [ ...]]
+npm home .
+```
+
+### Description
+
+This command tries to guess at the likely location of a package's
+documentation URL, and then tries to open it using the `--browser`
+config param. You can pass multiple package names at once. If no
+package name is provided, it will search for a `package.json` in
+the current folder and use the `name` property.
+
+### Configuration
+
+#### browser
+
+* Default: OS X: `"open"`, Windows: `"start"`, Others: `"xdg-open"`
+* Type: String
+
+The browser that is called by the `npm docs` command to open websites.
+
+#### registry
+
+* Default: https://registry.npmjs.org/
+* Type: url
+
+The base URL of the npm package registry.
+
+
+### See Also
+
+* [npm view](/cli-commands/npm-view)
+* [npm publish](/cli-commands/npm-publish)
+* [npm registry](/using-npm/registry)
+* [npm config](/cli-commands/npm-config)
+* [npmrc](/configuring-npm/npmrc)
+* [package.json](/configuring-npm/package-json)
diff --git a/deps/npm/doc/cli/npm-doctor.md b/deps/npm/docs/content/cli-commands/npm-doctor.md
similarity index 90%
rename from deps/npm/doc/cli/npm-doctor.md
rename to deps/npm/docs/content/cli-commands/npm-doctor.md
index 1a5738505cefee..7cec349e5a8145 100644
--- a/deps/npm/doc/cli/npm-doctor.md
+++ b/deps/npm/docs/content/cli-commands/npm-doctor.md
@@ -1,11 +1,20 @@
-npm-doctor(1) -- Check your environments
-========================================================
+---
+section: cli-commands
+title: npm-doctor
+description: Check your environments
+---
-## SYNOPSIS
+# npm-doctor(1)
- npm doctor
+## Check your environments
-## DESCRIPTION
+### Synopsis
+
+```bash
+npm doctor
+```
+
+### Description
`npm doctor` runs a set of checks to ensure that your npm installation has
what it needs to manage your JavaScript packages. npm is mostly a standalone tool, but it does
@@ -29,7 +38,7 @@ better than an old version.
`npm doctor` verifies the following items in your environment, and if there are
any recommended changes, it will display them.
-### `npm ping`
+#### `npm ping`
By default, npm installs from the primary npm registry, `registry.npmjs.org`.
`npm doctor` hits a special ping endpoint within the registry. This can also be
@@ -42,7 +51,7 @@ what that is by running `npm config get registry`), and if you're using a
private registry that doesn't support the `/whoami` endpoint supported by the
primary registry, this check may fail.
-### `npm -v`
+#### `npm -v`
While Node.js may come bundled with a particular version of npm, it's the
policy of the CLI team that we recommend all users run `npm@latest` if they
@@ -52,7 +61,7 @@ releases typically only receive critical security and regression fixes. The
team believes that the latest tested version of npm is almost always likely to
be the most functional and defect-free version of npm.
-### `node -v`
+#### `node -v`
For most users, in most circumstances, the best version of Node will be the
latest long-term support (LTS) release. Those of you who want access to new
@@ -61,7 +70,7 @@ running a newer version, and some of you may be required to run an older
version of Node because of enterprise change control policies. That's OK! But
in general, the npm team recommends that most users run Node.js LTS.
-### `npm config get registry`
+#### `npm config get registry`
Some of you may be installing from private package registries for your project
or company. That's great! Others of you may be following tutorials or
@@ -70,7 +79,7 @@ having. Sometimes, this may entail changing the registry you're pointing at.
This part of `npm doctor` just lets you, and maybe whoever's helping you with
support, know that you're not using the default registry.
-### `which git`
+#### `which git`
While it's documented in the README, it may not be obvious that npm needs Git
installed to do many of the things that it does. Also, in some cases
@@ -78,14 +87,14 @@ installed to do many of the things that it does. Also, in some cases
accessible via your `PATH` so that npm can find it. This check ensures that Git
is available.
-### Permissions checks
+#### Permissions checks
* Your cache must be readable and writable by the user running npm.
* Global package binaries must be writable by the user running npm.
* Your local `node_modules` path, if you're running `npm doctor` with a project
directory, must be readable and writable by the user running npm.
-### Validate the checksums of cached packages
+#### Validate the checksums of cached packages
When an npm package is published, the publishing process generates a checksum
that npm uses at install time to verify that the package didn't get corrupted
@@ -95,8 +104,8 @@ get cache`, and see what's in that cache with `npm cache ls` – probably more
than you were expecting!). In the event that there are corrupt packages in your
cache, you should probably run `npm cache clean` and reset the cache.
-## SEE ALSO
+### See Also
-* npm-bugs(1)
-* npm-help(1)
-* npm-ping(1)
+* [npm bugs](/cli-commands/npm-bugs)
+* [npm help](/cli-commands/npm-help)
+* [npm ping](/cli-commands/npm-ping)
diff --git a/deps/npm/doc/cli/npm-edit.md b/deps/npm/docs/content/cli-commands/npm-edit.md
similarity index 56%
rename from deps/npm/doc/cli/npm-edit.md
rename to deps/npm/docs/content/cli-commands/npm-edit.md
index f9913a015ad3bf..94b6a087fa102f 100644
--- a/deps/npm/doc/cli/npm-edit.md
+++ b/deps/npm/docs/content/cli-commands/npm-edit.md
@@ -1,16 +1,25 @@
-npm-edit(1) -- Edit an installed package
-========================================
+---
+section: cli-commands
+title: npm-edit
+description: Edit an installed package
+---
-## SYNOPSIS
+# npm-edit(1)
- npm edit [/...]
+## Edit an installed package
-## DESCRIPTION
+### Synopsis
+
+```bash
+npm edit [/...]
+```
+
+### Description
Selects a (sub)dependency in the current
working directory and opens the package folder in the default editor
(or whatever you've configured as the npm `editor` config -- see
-`npm-config(7)`.)
+[`npm-config`](npm-config).)
After it has been edited, the package is rebuilt so as to pick up any
changes in compiled packages.
@@ -19,9 +28,9 @@ For instance, you can do `npm install connect` to install connect
into your package, and then `npm edit connect` to make a few
changes to your locally installed copy.
-## CONFIGURATION
+### Configuration
-### editor
+#### editor
* Default: `EDITOR` environment variable if set, or `"vi"` on Posix,
or `"notepad"` on Windows.
@@ -29,11 +38,10 @@ changes to your locally installed copy.
The command to run for `npm edit` or `npm config edit`.
-## SEE ALSO
+### See Also
-* npm-folders(5)
-* npm-explore(1)
-* npm-install(1)
-* npm-config(1)
-* npm-config(7)
-* npmrc(5)
+* [npm folders](/configuring-npm/folders)
+* [npm explore](/cli-commands/npm-explore)
+* [npm install](/cli-commands/npm-install)
+* [npm config](/cli-commands/npm-config)
+* [npmrc](/configuring-npm/npmrc)
diff --git a/deps/npm/doc/cli/npm-explore.md b/deps/npm/docs/content/cli-commands/npm-explore.md
similarity index 50%
rename from deps/npm/doc/cli/npm-explore.md
rename to deps/npm/docs/content/cli-commands/npm-explore.md
index 44b77f94340d60..8ded96d40984fe 100644
--- a/deps/npm/doc/cli/npm-explore.md
+++ b/deps/npm/docs/content/cli-commands/npm-explore.md
@@ -1,11 +1,20 @@
-npm-explore(1) -- Browse an installed package
-=============================================
+ ---
+section: cli-commands
+title: npm-explore
+description: Browse an installed package
+---
-## SYNOPSIS
+# npm-explore(1)
- npm explore [ -- ]
+## Browse an installed package
-## DESCRIPTION
+### Synopsis
+
+```bash
+npm explore [ -- ]
+```
+
+### Description
Spawn a subshell in the directory of the installed package specified.
@@ -15,14 +24,16 @@ immediately terminates.
This is particularly handy in the case of git submodules in the
`node_modules` folder:
- npm explore some-dependency -- git pull origin master
+```bash
+npm explore some-dependency -- git pull origin master
+```
Note that the package is *not* automatically rebuilt afterwards, so be
sure to use `npm rebuild ` if you make any changes.
-## CONFIGURATION
+### Configuration
-### shell
+#### shell
* Default: SHELL environment variable, or "bash" on Posix, or "cmd" on
Windows
@@ -30,10 +41,10 @@ sure to use `npm rebuild ` if you make any changes.
The shell to run for the `npm explore` command.
-## SEE ALSO
+### See Also
-* npm-folders(5)
-* npm-edit(1)
-* npm-rebuild(1)
-* npm-build(1)
-* npm-install(1)
+* [npm folders](/configuring-npm/folders)
+* [npm edit](/cli-commands/npm-edit)
+* [npm rebuild](/cli-commands/npm-rebuild)
+* [npm build](/cli-commands/npm-build)
+* [npm install](/cli-commands/npm-install)
diff --git a/deps/npm/docs/content/cli-commands/npm-fund.md b/deps/npm/docs/content/cli-commands/npm-fund.md
new file mode 100644
index 00000000000000..64894e291fc4f6
--- /dev/null
+++ b/deps/npm/docs/content/cli-commands/npm-fund.md
@@ -0,0 +1,60 @@
+---
+section: cli-commands
+title: npm-fund
+description: Retrieve funding information
+---
+
+# npm-fund(1)
+
+## Retrieve funding information
+
+### Synopsis
+
+```bash
+ npm fund []
+```
+
+### Description
+
+This command retrieves information on how to fund the dependencies of
+a given project. If no package name is provided, it will list all
+dependencies that are looking for funding in a tree-structure in which
+are listed the type of funding and the url to visit. If a package name
+is provided then it tries to open its funding url using the `--browser`
+config param.
+
+The list will avoid duplicated entries and will stack all packages
+that share the same type/url as a single entry. Given this nature the
+list is not going to have the same shape of the output from `npm ls`.
+
+### Configuration
+
+#### browser
+
+* Default: OS X: `"open"`, Windows: `"start"`, Others: `"xdg-open"`
+* Type: String
+
+The browser that is called by the `npm fund` command to open websites.
+
+#### json
+
+* Default: false
+* Type: Boolean
+
+Show information in JSON format.
+
+#### unicode
+
+* Type: Boolean
+* Default: true
+
+Whether to represent the tree structure using unicode characters.
+Set it to `false` in order to use all-ansi output.
+
+## See Also
+
+* [npm docs](/cli-commands/npm-docs)
+* [npm config](/cli-commands/npm-config)
+* [npm install](/cli-commands/npm-install)
+* [npm ls](/cli-commands/npm-ls)
+
diff --git a/deps/npm/doc/cli/npm-help-search.md b/deps/npm/docs/content/cli-commands/npm-help-search.md
similarity index 64%
rename from deps/npm/doc/cli/npm-help-search.md
rename to deps/npm/docs/content/cli-commands/npm-help-search.md
index 74e1011ab00679..69d005cb160ed7 100644
--- a/deps/npm/doc/cli/npm-help-search.md
+++ b/deps/npm/docs/content/cli-commands/npm-help-search.md
@@ -1,11 +1,20 @@
-npm-help-search(1) -- Search npm help documentation
-===================================================
+---
+section: cli-commands
+title: npm-help-search
+description: Search npm help documentation
+---
-## SYNOPSIS
+# npm-help-search(1)
- npm help-search
+## Search npm help documentation
-## DESCRIPTION
+### Synopsis
+
+```bash
+npm help-search
+```
+
+### Description
This command will search the npm markdown documentation files for the
terms provided, and then list the results, sorted by relevance.
@@ -16,9 +25,9 @@ If the argument to `npm help` is not a known help topic, then it will
call `help-search`. It is rarely if ever necessary to call this
command directly.
-## CONFIGURATION
+### Configuration
-### long
+#### long
* Type: Boolean
* Default: false
@@ -28,7 +37,7 @@ where the terms were found in the documentation.
If false, then help-search will just list out the help topics found.
-## SEE ALSO
+### See Also
-* npm(1)
-* npm-help(1)
+* [npm](/cli-commands/npm)
+* [npm help](/cli-commands/npm-help)
diff --git a/deps/npm/doc/cli/npm-help.md b/deps/npm/docs/content/cli-commands/npm-help.md
similarity index 52%
rename from deps/npm/doc/cli/npm-help.md
rename to deps/npm/docs/content/cli-commands/npm-help.md
index 5230082b923fa9..c47676ffcac1d3 100644
--- a/deps/npm/doc/cli/npm-help.md
+++ b/deps/npm/docs/content/cli-commands/npm-help.md
@@ -1,11 +1,20 @@
-npm-help(1) -- Get help on npm
-==============================
+---
+section: cli-commands
+title: npm-help
+description: Get help on npm
+---
-## SYNOPSIS
+# npm-help(1)
- npm help []
+## Get help on npm
-## DESCRIPTION
+### Synopsis
+
+```bash
+npm help []
+```
+
+### Description
If supplied a topic, then show the appropriate documentation page.
@@ -14,9 +23,9 @@ the `help-search` command to find a match. Note that, if `help-search`
finds a single subject, then it will run `help` on that topic, so unique
matches are equivalent to specifying a topic name.
-## CONFIGURATION
+### Configuration
-### viewer
+#### viewer
* Default: "man" on Posix, "browser" on Windows
* Type: path
@@ -25,14 +34,11 @@ The program to use to view help content.
Set to `"browser"` to view html help content in the default web browser.
-## SEE ALSO
-
-* npm(1)
-* README
-* npm-folders(5)
-* npm-config(1)
-* npm-config(7)
-* npmrc(5)
-* package.json(5)
-* npm-help-search(1)
-* npm-index(7)
+### See Also
+
+* [npm](/cli-commands/npm)
+* [npm folders](/configuring-npm/folders)
+* [npm config](/cli-commands/npm-config)
+* [npmrc](/configuring-npm/npmrc)
+* [package.json](/configuring-npm/package-json)
+* [npm help-search](/cli-commands/npm-help-search)
diff --git a/deps/npm/doc/cli/npm-hook.md b/deps/npm/docs/content/cli-commands/npm-hook.md
similarity index 75%
rename from deps/npm/doc/cli/npm-hook.md
rename to deps/npm/docs/content/cli-commands/npm-hook.md
index 519287242574a0..ce4bbccb3593b3 100644
--- a/deps/npm/doc/cli/npm-hook.md
+++ b/deps/npm/docs/content/cli-commands/npm-hook.md
@@ -1,54 +1,62 @@
-npm-hook(1) -- Manage registry hooks
-===================================
+---
+section: cli-commands
+title: npm-hook
+description: Manage registry hooks
+---
-## SYNOPSIS
+# npm-hook(1)
- npm hook ls [pkg]
- npm hook add
- npm hook update [secret]
- npm hook rm
+## Manage registry hooks
-## EXAMPLE
+### Synopsis
-Add a hook to watch a package for changes:
+```bash
+npm hook ls [pkg]
+npm hook add
+npm hook update [secret]
+npm hook rm
```
+
+### Example
+
+Add a hook to watch a package for changes:
+```bash
$ npm hook add lodash https://example.com/ my-shared-secret
```
Add a hook to watch packages belonging to the user `substack`:
-```
+```bash
$ npm hook add ~substack https://example.com/ my-shared-secret
```
Add a hook to watch packages in the scope `@npm`
-```
+```bash
$ npm hook add @npm https://example.com/ my-shared-secret
```
List all your active hooks:
-```
+```bash
$ npm hook ls
```
List your active hooks for the `lodash` package:
-```
+```bash
$ npm hook ls lodash
```
Update an existing hook's url:
-```
+```bash
$ npm hook update id-deadbeef https://my-new-website.here/
```
Remove a hook:
-```
+```bash
$ npm hook rm id-deadbeef
```
-## DESCRIPTION
+### Description
-Allows you to manage [npm
-hooks](https://blog.npmjs.org/post/145260155635/introducing-hooks-get-notifications-of-npm),
+Allows you to manage [npm hooks](https://blog.npmjs.org/post/145260155635/introducing-hooks-get-notifications-of-npm),
including adding, removing, listing, and updating.
Hooks allow you to configure URL endpoints that will be notified whenever a
@@ -67,6 +75,6 @@ that particular hook.
The shared secret will be sent along to the URL endpoint so you can verify the
request came from your own configured hook.
-## SEE ALSO
+### See Also
* ["Introducing Hooks" blog post](https://blog.npmjs.org/post/145260155635/introducing-hooks-get-notifications-of-npm)
diff --git a/deps/npm/doc/cli/npm-init.md b/deps/npm/docs/content/cli-commands/npm-init.md
similarity index 73%
rename from deps/npm/doc/cli/npm-init.md
rename to deps/npm/docs/content/cli-commands/npm-init.md
index b91bcafae83774..73ad74b23ea998 100644
--- a/deps/npm/doc/cli/npm-init.md
+++ b/deps/npm/docs/content/cli-commands/npm-init.md
@@ -1,43 +1,51 @@
-npm-init(1) -- create a package.json file
-=======================================================
+---
+section: cli-commands
+title: npm-init
+description: create a package.json file
+---
-## SYNOPSIS
+# npm-init(1)
- npm init [--force|-f|--yes|-y|--scope]
- npm init <@scope> (same as `npx <@scope>/create`)
- npm init [<@scope>/] (same as `npx [<@scope>/]create-`)
+## create a package.json file
-## EXAMPLES
+### Synopsis
+```bash
+npm init [--force|-f|--yes|-y|--scope]
+npm init <@scope> (same as `npx <@scope>/create`)
+npm init [<@scope>/] (same as `npx [<@scope>/]create-`)
+```
+
+### Examples
Create a new React-based project using [`create-react-app`](https://npm.im/create-react-app):
-```
+```bash
$ npm init react-app ./my-react-app
```
Create a new `esm`-compatible package using [`create-esm`](https://npm.im/create-esm):
-```
+```bash
$ mkdir my-esm-lib && cd my-esm-lib
$ npm init esm --yes
```
Generate a plain old package.json using legacy init:
-```
+```bash
$ mkdir my-npm-pkg && cd my-npm-pkg
$ git init
$ npm init
```
Generate it without having it ask any questions:
-```
+```bash
$ npm init -y
```
-## DESCRIPTION
+### Description
`npm init ` can be used to set up a new or existing npm package.
`initializer` in this case is an npm package named `create-`, which
-will be installed by [`npx(1)`](https://npm.im/npx), and then have its main bin
+will be installed by [`npx`](https://npm.im/npx), and then have its main bin
executed -- presumably creating or updating `package.json` and running any other
initialization-related operations.
@@ -58,9 +66,9 @@ it will keep any fields and values that were already set. You can also use
`-y`/`--yes` to skip the questionnaire altogether. If you pass `--scope`, it
will create a scoped package.
-## SEE ALSO
+### See Also
*
-* package.json(5)
-* npm-version(1)
-* npm-scope(7)
+* [package.json](/configuring-npm/package-json)
+* [npm version](/cli-commands/npm-version)
+* [npm scope](/using-npm/scope)
diff --git a/deps/npm/docs/content/cli-commands/npm-install-ci-test.md b/deps/npm/docs/content/cli-commands/npm-install-ci-test.md
new file mode 100644
index 00000000000000..98e40f4b27a77d
--- /dev/null
+++ b/deps/npm/docs/content/cli-commands/npm-install-ci-test.md
@@ -0,0 +1,26 @@
+---
+section: cli-commands
+title: npm-install-ci-test
+description: Install a project with a clean slate and run tests
+---
+
+# npm install-ci-test(1)
+
+## Install a project with a clean slate and run tests
+
+### Synopsis
+
+```bash
+npm install-ci-test
+
+alias: npm cit
+```
+
+### Description
+
+This command runs an `npm ci` followed immediately by an `npm test`.
+
+### See Also
+
+* [npm ci](/cli-commands/npm-ci)
+* [npm test](/cli-commands/npm-test)
diff --git a/deps/npm/docs/content/cli-commands/npm-install-test.md b/deps/npm/docs/content/cli-commands/npm-install-test.md
new file mode 100644
index 00000000000000..b86a5199117c4a
--- /dev/null
+++ b/deps/npm/docs/content/cli-commands/npm-install-test.md
@@ -0,0 +1,35 @@
+---
+section: cli-commands
+title: npm-install-test
+description: Install package(s) and run tests
+---
+
+# npm install-test(1)
+
+## Install package(s) and run tests
+
+### Synopsis
+
+```bash
+npm install-test (with no args, in package dir)
+npm install-test [<@scope>/]
+npm install-test [<@scope>/]@
+npm install-test [<@scope>/]@
+npm install-test [<@scope>/]@
+npm install-test
+npm install-test
+npm install-test
+
+alias: npm it
+common options: [--save|--save-dev|--save-optional] [--save-exact] [--dry-run]
+```
+
+### Description
+
+This command runs an `npm install` followed immediately by an `npm test`. It
+takes exactly the same arguments as `npm install`.
+
+### See Also
+
+* [npm install](/cli-commands/npm-install)
+* [npm test](/cli-commands/npm-test)
diff --git a/deps/npm/doc/cli/npm-install.md b/deps/npm/docs/content/cli-commands/npm-install.md
similarity index 71%
rename from deps/npm/doc/cli/npm-install.md
rename to deps/npm/docs/content/cli-commands/npm-install.md
index 4ff4a47cbcf4ee..8e661bf643f394 100644
--- a/deps/npm/doc/cli/npm-install.md
+++ b/deps/npm/docs/content/cli-commands/npm-install.md
@@ -1,36 +1,46 @@
-npm-install(1) -- Install a package
-===================================
+---
+section: cli-commands
+title: npm-install
+description: Install a package
+---
-## SYNOPSIS
+# npm-install(1)
- npm install (with no args, in package dir)
- npm install [<@scope>/]
- npm install [<@scope>/]@
- npm install [<@scope>/]@
- npm install [<@scope>/]@
- npm install :/
- npm install
- npm install
- npm install
- npm install
+## Install a package
- aliases: npm i, npm add
- common options: [-P|--save-prod|-D|--save-dev|-O|--save-optional] [-E|--save-exact] [-B|--save-bundle] [--no-save] [--dry-run]
+### Synopsis
-## DESCRIPTION
+```bash
+npm install (with no args, in package dir)
+npm install [<@scope>/]
+npm install [<@scope>/]@
+npm install [<@scope>/]@
+npm install [<@scope>/]@
+npm install @npm:
+npm install :/
+npm install
+npm install
+npm install
+npm install
+
+aliases: npm i, npm add
+common options: [-P|--save-prod|-D|--save-dev|-O|--save-optional] [-E|--save-exact] [-B|--save-bundle] [--no-save] [--dry-run]
+```
+
+### Description
This command installs a package, and any packages that it depends on. If the
package has a package-lock or shrinkwrap file, the installation of dependencies
will be driven by that, with an `npm-shrinkwrap.json` taking precedence if both
-files exist. See package-lock.json(5) and npm-shrinkwrap(1).
+files exist. See [package-lock.json](/configuring-npm/package-lock-json) and [`npm shrinkwrap`](/cli-commands/npm-shrinkwrap).
A `package` is:
-* a) a folder containing a program described by a `package.json(5)` file
+* a) a folder containing a program described by a [`package.json`](/configuring-npm/package-json) file
* b) a gzipped tarball containing (a)
* c) a url that resolves to (b)
-* d) a `@` that is published on the registry (see `npm-registry(7)`) with (c)
-* e) a `@` (see `npm-dist-tag(1)`) that points to (d)
+* d) a `@` that is published on the registry (see [`registry`](/using-npm/registry)) with (c)
+* e) a `@` (see [`npm dist-tag`](/cli-commands/npm-dist-tag)) that points to (d)
* f) a `` that has a "latest" tag satisfying (e)
* g) a `` that resolves to (a)
@@ -49,11 +59,13 @@ after packing it up into a tarball (b).
directory) as a global package.
By default, `npm install` will install all modules listed as dependencies
- in `package.json(5)`.
+ in [`package.json`](/configuring-npm/package-json).
With the `--production` flag (or when the `NODE_ENV` environment variable
is set to `production`), npm will not install modules listed in
- `devDependencies`.
+ `devDependencies`. To install all modules listed in both `dependencies`
+ and `devDependencies` when `NODE_ENV` environment variable is set to `production`,
+ you can use `--production=false`.
> NOTE: The `--production` flag has no particular meaning when adding a
dependency to a project.
@@ -93,7 +105,7 @@ after packing it up into a tarball (b).
* `npm install [<@scope>/]`:
Do a `@` install, where `` is the "tag" config. (See
- `npm-config(7)`. The config's default value is `latest`.)
+ [`config`](/using-npm/config). The config's default value is `latest`.)
In most cases, this will install the version of the modules tagged as
`latest` on the npm registry.
@@ -102,6 +114,24 @@ after packing it up into a tarball (b).
npm install sax
+* `npm install @npm:`:
+
+ Install a package under a custom alias. Allows multiple versions of
+ a same-name package side-by-side, more convenient import names for
+ packages with otherwise long ones and using git forks replacements
+ or forked npm packages as replacements. Aliasing works only on your
+ project and does not rename packages in transitive dependencies.
+ Aliases should follow the naming conventions stated in
+ [`validate-npm-package-name`](https://www.npmjs.com/package/validate-npm-package-name#naming-rules).
+
+ Examples:
+
+ npm install my-react@npm:react
+ npm install jquery2@npm:jquery@2
+ npm install jquery3@npm:jquery@3
+ npm install npa@npm:npm-package-arg
+
+
`npm install` saves any specified packages into `dependencies` by default.
Additionally, you can control where and how they get saved with some
additional flags:
@@ -129,7 +159,7 @@ after packing it up into a tarball (b).
`` is optional. The package will be downloaded from the registry
associated with the specified scope. If no registry is associated with
- the given scope the default registry is assumed. See `npm-scope(7)`.
+ the given scope the default registry is assumed. See [`scope`](/using-npm/scope).
Note: if you do not include the @-symbol on your scope name, npm will
interpret this as a GitHub repository instead, see below. Scopes names
@@ -137,14 +167,15 @@ after packing it up into a tarball (b).
Examples:
- npm install sax
- npm install githubname/reponame
- npm install @myorg/privatepackage
- npm install node-tap --save-dev
- npm install dtrace-provider --save-optional
- npm install readable-stream --save-exact
- npm install ansi-regex --save-bundle
-
+ ```bash
+ npm install sax
+ npm install githubname/reponame
+ npm install @myorg/privatepackage
+ npm install node-tap --save-dev
+ npm install dtrace-provider --save-optional
+ npm install readable-stream --save-exact
+ npm install ansi-regex --save-bundle
+ ```
**Note**: If there is a file or folder named `` in the current
working directory, then it will try to install that, and only try to
@@ -158,8 +189,10 @@ after packing it up into a tarball (b).
Example:
- npm install sax@latest
- npm install @myorg/mypackage@latest
+ ```bash
+ npm install sax@latest
+ npm install @myorg/mypackage@latest
+ ```
* `npm install [<@scope>/]@`:
@@ -168,28 +201,33 @@ after packing it up into a tarball (b).
Example:
- npm install sax@0.1.1
- npm install @myorg/privatepackage@1.5.0
+ ```bash
+ npm install sax@0.1.1
+ npm install @myorg/privatepackage@1.5.0
+ ```
* `npm install [<@scope>/]@`:
Install a version of the package matching the specified version range. This
- will follow the same rules for resolving dependencies described in `package.json(5)`.
+ will follow the same rules for resolving dependencies described in [`package.json`](/configuring-npm/package-json).
Note that most version ranges must be put in quotes so that your shell will
treat it as a single argument.
Example:
-
- npm install sax@">=0.1.0 <0.2.0"
- npm install @myorg/privatepackage@">=0.1.0 <0.2.0"
+ ```bash
+ npm install sax@">=0.1.0 <0.2.0"
+ npm install @myorg/privatepackage@">=0.1.0 <0.2.0"
+ ```
* `npm install `:
Installs the package from the hosted git provider, cloning it with `git`.
For a full git remote url, only that URL will be attempted.
- ://[[:]@][:][:][/][# | #semver:]
+ ```bash
+ ://[[:]@][:][:][/][# | #semver:]
+ ```
`` is one of `git`, `git+ssh`, `git+http`, `git+https`, or
`git+file`.
@@ -223,11 +261,13 @@ after packing it up into a tarball (b).
Examples:
- npm install git+ssh://git@github.com:npm/cli.git#v1.0.27
- npm install git+ssh://git@github.com:npm/cli#semver:^5.0
- npm install git+https://isaacs@github.com/npm/cli.git
- npm install git://github.com/npm/cli.git#v1.0.27
- GIT_SSH_COMMAND='ssh -i ~/.ssh/custom_ident' npm install git+ssh://git@github.com:npm/cli.git
+ ```bash
+ npm install git+ssh://git@github.com:npm/cli.git#v1.0.27
+ npm install git+ssh://git@github.com:npm/cli#semver:^5.0
+ npm install git+https://isaacs@github.com/npm/cli.git
+ npm install git://github.com/npm/cli.git#v1.0.27
+ GIT_SSH_COMMAND='ssh -i ~/.ssh/custom_ident' npm install git+ssh://git@github.com:npm/cli.git
+ ```
* `npm install /