Skip to content

Commit 4935d03

Browse files
committed
Revert "Merge branch 'nodejs:main' into main"
This reverts commit e5d42eb, reversing changes made to e9b71a8.
1 parent e5d42eb commit 4935d03

511 files changed

Lines changed: 6205 additions & 190905 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@
108108
/benchmark/misc/startup.js @nodejs/startup
109109
/src/node.cc @nodejs/startup
110110
/src/node_native_module* @nodejs/startup
111-
/src/node_snapshot* @nodejs/startup
112111
/lib/internal/bootstrap/* @nodejs/startup
113112
/tools/snapshot/* @nodejs/startup
114113

.github/ISSUE_TEMPLATE/1-bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ body:
1919
label: Platform
2020
description: |
2121
UNIX: output of `uname -a`
22-
Windows: output of `"$([Environment]::OSVersion.VersionString) $(('x86', 'x64')[[Environment]::Is64BitOperatingSystem])"` in PowerShell console
22+
Windows: output of `"$([Environment]::OSVersion | ForEach-Object VersionString) $(if ([Environment]::Is64BitOperatingSystem) { "x64" } else { "x86" })"` in PowerShell console
2323
- type: input
2424
attributes:
2525
label: Subsystem

.github/workflows/test-internet.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ permissions:
2929

3030
jobs:
3131
test-internet:
32-
if: github.repository == 'nodejs/node' || github.event_name != 'schedule'
3332
runs-on: ubuntu-latest
3433
steps:
3534
- uses: actions/checkout@v3

.mailmap

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,6 @@ Ke Ding <dingkework@hotmail.com>
287287
Keith M Wesolowski <wesolows@joyent.com> <wesolows@foobazco.org>
288288
Kelsey Breseman <ifoundthemeaningoflife@gmail.com>
289289
Kevin Millikin <kmillikin@chromium.org>
290-
Keyhan Vakil <kvakil@sylph.kvakil.me> <60900335+airtable-keyhanvakil@users.noreply.github.com>
291-
Keyhan Vakil <kvakil@sylph.kvakil.me> <kvakil@github.kvakil.me>
292290
Khaidi Chu <i@2333.moe>
293291
Khaidi Chu <i@2333.moe> <admin@xcoder.in>
294292
Kimberly Wilber <gcr@sneakygcr.net>
@@ -431,8 +429,6 @@ Ron Korving <ron@ronkorving.nl> <rkorving@wizcorp.jp>
431429
Ruben Bridgewater <ruben@bridgewater.de> <ruben.bridgewater@fintura.de>
432430
Ruben Bridgewater <ruben@bridgewater.de> <ruben.bridgewater@maibornwolff.de>
433431
Russell Dempsey <sgtpooki@gmail.com> <SgtPooki@gmail.com>
434-
Ruy Adorno <ruyadorno@google.com> <ruyadorno@github.com>
435-
Ruy Adorno <ruyadorno@google.com> <ruyadorno@hotmail.com>
436432
Ryan Dahl <ry@tinyclouds.org>
437433
Ryan Emery <seebees@gmail.com>
438434
Ryan Mahan <ryanmahan97@gmail.com>

AUTHORS

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ Joran Siu <joransiu@ca.ibm.com>
10481048
Vitaly Tomilov <vitaly-t@users.noreply.github.com>
10491049
Ratikesh Misra <ratikesh92@gmail.com>
10501050
Alex Perkins <aperkin@rei.com>
1051-
Beth Griggs <bethanyngriggs@gmail.com>
1051+
Beth Griggs <bgriggs@redhat.com>
10521052
Joe Esposito <joe@joeyespo.com>
10531053
Erin Spiceland <yes@erin.codes>
10541054
Ravindra Barthwal <ravindrabarthwal@users.noreply.github.com>
@@ -1784,7 +1784,7 @@ Christopher Sidebottom <chris@damouse.co.uk>
17841784
Edward Andrew Robinson <earobinson@gmail.com>
17851785
Shakeel Mohamed <contact@shakeel.xyz>
17861786
Tobias Kieslich <tobias.kieslich@gmail.com>
1787-
Ruy Adorno <ruyadorno@google.com>
1787+
Ruy Adorno <ruyadorno@hotmail.com>
17881788
Stefania Sharp <stefaniasharp@gmail.com>
17891789
Pawel Golda <pawelgolda@gmail.com>
17901790
Steven Scott <Contact@TheDgtl.net>
@@ -3457,7 +3457,7 @@ Yagiz Nizipli <yagiz@nizipli.com>
34573457
liuxingbaoyu <30521560+liuxingbaoyu@users.noreply.github.com>
34583458
Sergey Nazaryev <sergey@nazaryev.com>
34593459
William Marlow <william.marlow@ibm.com>
3460-
Keyhan Vakil <kvakil@sylph.kvakil.me>
3460+
Keyhan Vakil <60900335+airtable-keyhanvakil@users.noreply.github.com>
34613461
Feng Yu <F3n67u@outlook.com>
34623462
pupilTong <pupiltong@outlook.com>
34633463
rikapo <rikaporori@gmail.com>
@@ -3490,15 +3490,5 @@ John Gee <john@ruru.gen.nz>
34903490
Hrishikesh Kadam <hrkadam.92@gmail.com>
34913491
KrayzeeKev <github@lentinfamily.com>
34923492
Airing <airing@ursb.me>
3493-
jiahao.si <sijiahao0839@gmail.com>
3494-
Rhys <Anemy@users.noreply.github.com>
3495-
Mark S. Miller <erights@users.noreply.github.com>
3496-
Jianru Lin <jianru.lin@gmail.com>
3497-
Lenvin Gonsalves <41874033+98lenvi@users.noreply.github.com>
3498-
Andreu Botella <andreu@andreubotella.com>
3499-
shhh7612 <82669765+shhh7612@users.noreply.github.com>
3500-
Dominic Saadi <dominiceliassaadi@gmail.com>
3501-
ywave620 <60539365+ywave620@users.noreply.github.com>
3502-
NicoNekoru <66227158+NicoNekoru@users.noreply.github.com>
35033493

35043494
# Generated by tools/update-authors.mjs

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,6 @@ For information about the governance of the Node.js project, see
310310
**Daniele Belardi** <<dwon.dnl@gmail.com>> (he/him)
311311
* [edsadr](https://github.com/edsadr) -
312312
**Adrian Estrada** <<edsadr@gmail.com>> (he/him)
313-
* [erickwendel](https://github.com/erickwendel) -
314-
**Erick Wendel** <<erick.workspace@gmail.com>> (he/him)
315313
* [evanlucas](https://github.com/evanlucas) -
316314
**Evan Lucas** <<evanlucas@me.com>> (he/him)
317315
* [fhinkel](https://github.com/fhinkel) -
@@ -407,7 +405,7 @@ For information about the governance of the Node.js project, see
407405
* [ronag](https://github.com/ronag) -
408406
**Robert Nagy** <<ronagy@icloud.com>>
409407
* [ruyadorno](https://github.com/ruyadorno) -
410-
**Ruy Adorno** <<ruyadorno@google.com>> (he/him)
408+
**Ruy Adorno** <<ruyadorno@github.com>> (he/him)
411409
* [rvagg](https://github.com/rvagg) -
412410
**Rod Vagg** <<rod@vagg.org>>
413411
* [ryzokuken](https://github.com/ryzokuken) -
@@ -426,8 +424,6 @@ For information about the governance of the Node.js project, see
426424
**Stewart X Addison** <<sxa@redhat.com>> (he/him)
427425
* [targos](https://github.com/targos) -
428426
**Michaël Zasso** <<targos@protonmail.com>> (he/him)
429-
* [theanarkh](https://github.com/theanarkh) -
430-
**theanarkh** <<theratliter@gmail.com>> (he/him)
431427
* [TimothyGu](https://github.com/TimothyGu) -
432428
**Tiancheng "Timothy" Gu** <<timothygu99@gmail.com>> (he/him)
433429
* [tniessen](https://github.com/tniessen) -
@@ -662,8 +658,6 @@ maintaining the Node.js project.
662658
**Himadri Ganguly** <<himadri.tech@gmail.com>> (he/him)
663659
* [iam-frankqiu](https://github.com/iam-frankqiu) -
664660
**Frank Qiu** <<iam.frankqiu@gmail.com>> (he/him)
665-
* [kvakil](https://github.com/kvakil) -
666-
**Keyhan Vakil** <<kvakil@sylph.kvakil.me>> (they/them)
667661
* [marsonya](https://github.com/marsonya) -
668662
**Akhil Marsonya** <<akhil.marsonya27@gmail.com>> (he/him)
669663
* [meixg](https://github.com/meixg) -

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.11',
39+
'v8_embedder_string': '-node.10',
4040

4141
##### V8 defaults for Node.js #####
4242

deps/base64/base64/lib/arch/neon64/codec.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,8 @@ load_64byte_table (const uint8_t *p)
5858
#include "../generic/32/dec_loop.c"
5959
#include "../generic/64/enc_loop.c"
6060
#include "dec_loop.c"
61-
62-
#ifdef BASE64_NEON64_USE_ASM
63-
# include "enc_loop_asm.c"
64-
#else
65-
# include "enc_reshuffle.c"
66-
# include "enc_loop.c"
67-
#endif
61+
#include "enc_reshuffle.c"
62+
#include "enc_loop.c"
6863

6964
#endif // BASE64_USE_NEON64
7065

deps/base64/base64/lib/arch/neon64/enc_loop.c

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,72 @@
1+
#ifdef BASE64_NEON64_USE_ASM
2+
static inline void
3+
enc_loop_neon64_inner_asm (const uint8_t **s, uint8_t **o, const uint8x16x4_t tbl_enc)
4+
{
5+
// This function duplicates the functionality of enc_loop_neon64_inner,
6+
// but entirely with inline assembly. This gives a significant speedup
7+
// over using NEON intrinsics, which do not always generate very good
8+
// code. The logic of the assembly is directly lifted from the
9+
// intrinsics version, so it can be used as a guide to this code.
10+
11+
// Temporary registers, used as scratch space.
12+
uint8x16_t tmp0, tmp1, tmp2, tmp3;
13+
14+
// Numeric constant.
15+
const uint8x16_t n63 = vdupq_n_u8(63);
16+
17+
__asm__ (
18+
19+
// Load 48 bytes and deinterleave. The bytes are loaded to
20+
// hard-coded registers v12, v13 and v14, to ensure that they
21+
// are contiguous. Increment the source pointer.
22+
"ld3 {v12.16b, v13.16b, v14.16b}, [%[src]], #48 \n\t"
23+
24+
// Reshuffle the bytes using temporaries.
25+
"ushr %[t0].16b, v12.16b, #2 \n\t"
26+
"ushr %[t1].16b, v13.16b, #4 \n\t"
27+
"ushr %[t2].16b, v14.16b, #6 \n\t"
28+
"sli %[t1].16b, v12.16b, #4 \n\t"
29+
"sli %[t2].16b, v13.16b, #2 \n\t"
30+
"and %[t1].16b, %[t1].16b, %[n63].16b \n\t"
31+
"and %[t2].16b, %[t2].16b, %[n63].16b \n\t"
32+
"and %[t3].16b, v14.16b, %[n63].16b \n\t"
33+
34+
// Translate the values to the Base64 alphabet.
35+
"tbl v12.16b, {%[l0].16b, %[l1].16b, %[l2].16b, %[l3].16b}, %[t0].16b \n\t"
36+
"tbl v13.16b, {%[l0].16b, %[l1].16b, %[l2].16b, %[l3].16b}, %[t1].16b \n\t"
37+
"tbl v14.16b, {%[l0].16b, %[l1].16b, %[l2].16b, %[l3].16b}, %[t2].16b \n\t"
38+
"tbl v15.16b, {%[l0].16b, %[l1].16b, %[l2].16b, %[l3].16b}, %[t3].16b \n\t"
39+
40+
// Store 64 bytes and interleave. Increment the dest pointer.
41+
"st4 {v12.16b, v13.16b, v14.16b, v15.16b}, [%[dst]], #64 \n\t"
42+
43+
// Outputs (modified).
44+
: [src] "+r" (*s),
45+
[dst] "+r" (*o),
46+
[t0] "=&w" (tmp0),
47+
[t1] "=&w" (tmp1),
48+
[t2] "=&w" (tmp2),
49+
[t3] "=&w" (tmp3)
50+
51+
// Inputs (not modified).
52+
: [n63] "w" (n63),
53+
[l0] "w" (tbl_enc.val[0]),
54+
[l1] "w" (tbl_enc.val[1]),
55+
[l2] "w" (tbl_enc.val[2]),
56+
[l3] "w" (tbl_enc.val[3])
57+
58+
// Clobbers.
59+
: "v12", "v13", "v14", "v15"
60+
);
61+
}
62+
#endif
63+
164
static inline void
265
enc_loop_neon64_inner (const uint8_t **s, uint8_t **o, const uint8x16x4_t tbl_enc)
366
{
67+
#ifdef BASE64_NEON64_USE_ASM
68+
enc_loop_neon64_inner_asm(s, o, tbl_enc);
69+
#else
470
// Load 48 bytes and deinterleave:
571
uint8x16x3_t src = vld3q_u8(*s);
672

@@ -20,6 +86,7 @@ enc_loop_neon64_inner (const uint8_t **s, uint8_t **o, const uint8x16x4_t tbl_en
2086

2187
*s += 48;
2288
*o += 64;
89+
#endif
2390
}
2491

2592
static inline void

deps/base64/base64/lib/arch/neon64/enc_loop_asm.c

Lines changed: 0 additions & 167 deletions
This file was deleted.

0 commit comments

Comments
 (0)