gen_stubs: Add complete coverage for all (non-ILP32) arches.#20943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alexrp wants to merge 1 commit into from
Closed

gen_stubs: Add complete coverage for all (non-ILP32) arches. #20943

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 87 additions & 50 deletions tools/gen_stubs.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,23 +2,38 @@
//! ./gen_stubs /path/to/musl/build-all >libc.S
//!
//! The directory 'build-all' is expected to contain these subdirectories:
//! arm x86 mips mips64 powerpc powerpc64 riscv32 riscv64 x86_64 loongarch64
//! - arm
//! - aarch64
//! - loongarch64
//! - m68k
//! - mips
//! - mips64
//! - powerpc
//! - powerpc64
//! - riscv32
//! - riscv64
//! - s390x
//! - x86
//! - x86_64
//!
//! ...each with 'lib/libc.so' inside of them.
//!
//! When building the resulting libc.S file, these defines are required:
//! * `-DPTR64`: when the architecture is 64-bit
//! * One of the following, corresponding to the CPU architecture:
//! - `-DARCH_riscv32`
//! - `-DARCH_riscv64`
//! - `-DARCH_arm`
//! - `-DARCH_aarch64`
//! - `-DARCH_loongarch64`
//! - `-DARCH_m68k`
//! - `-DARCH_mips`
//! - `-DARCH_mips64`
//! - `-DARCH_i386`
//! - `-DARCH_x86_64`
//! - `-DARCH_powerpc`
//! - `-DARCH_powerpc64`
//! - `-DARCH_aarch64`
//! - `-DARCH_loongarch64`
//! - `-DARCH_riscv32`
//! - `-DARCH_riscv64`
//! - `-DARCH_s390x`
//! - `-DARCH_x86`
//! - `-DARCH_x86_64`

// TODO: pick the best index to put them into instead of at the end
// - e.g. find a common previous symbol and put it after that one
Expand All@@ -32,16 +47,19 @@ const elf = std.elf;
const native_endian = @import("builtin").target.cpu.arch.endian();

const inputs = .{
.riscv32,
.riscv64,
.arm,
.aarch64,
.loongarch64,
.m68k,
.mips,
.mips64,
.x86,
.x86_64,
.powerpc,
.powerpc64,
.aarch64,
.riscv32,
.riscv64,
.s390x,
.x86,
.x86_64,
};

const arches: [inputs.len]std.Target.Cpu.Arch = blk: {
Expand DownExpand Up@@ -70,16 +88,19 @@ const MultiSym = struct {
}

fn is32Only(ms: MultiSym) bool {
return ms.present[archIndex(.riscv32)] == true and
ms.present[archIndex(.riscv64)] == false and
return ms.present[archIndex(.arm)] == true and
ms.present[archIndex(.aarch64)] == false and
ms.present[archIndex(.loongarch64)] == false and
ms.present[archIndex(.m68k)] == true and
ms.present[archIndex(.mips)] == true and
ms.present[archIndex(.mips64)] == false and
ms.present[archIndex(.x86)] == true and
ms.present[archIndex(.x86_64)] == false and
ms.present[archIndex(.powerpc)] == true and
ms.present[archIndex(.powerpc64)] == false and
ms.present[archIndex(.aarch64)] == false and
ms.present[archIndex(.loongarch64)] == false;
ms.present[archIndex(.riscv32)] == true and
ms.present[archIndex(.riscv64)] == false and
ms.present[archIndex(.s390x)] == false and
ms.present[archIndex(.x86)] == true and
ms.present[archIndex(.x86_64)] == false;
}

fn commonSize(ms: MultiSym) ?u64 {
Expand DownExpand Up@@ -114,16 +135,19 @@ const MultiSym = struct {

fn isPtrSize(ms: MultiSym) bool {
const map = .{
.{ .riscv32, 4 },
.{ .riscv64, 8 },
.{ .arm, 4 },
.{ .aarch64, 8 },
.{ .loongarch64, 8 },
.{ .m68k, 4 },
.{ .mips, 4 },
.{ .mips64, 8 },
.{ .x86, 4 },
.{ .x86_64, 8 },
.{ .powerpc, 4 },
.{ .powerpc64, 8 },
.{ .aarch64, 8 },
.{ .loongarch64, 8 },
.{ .riscv32, 4 },
.{ .riscv64, 8 },
.{ .s390x, 8 },
.{ .x86, 4 },
.{ .x86_64, 8 },
};
inline for (map) |item| {
const arch = item[0];
Expand All@@ -138,16 +162,19 @@ const MultiSym = struct {

fn isPtr2Size(ms: MultiSym) bool {
const map = .{
.{ .riscv32, 8 },
.{ .riscv64, 16 },
.{ .arm, 8 },
.{ .aarch64, 16 },
.{ .loongarch64, 16 },
.{ .m68k, 4 },
.{ .mips, 8 },
.{ .mips64, 16 },
.{ .x86, 8 },
.{ .x86_64, 16 },
.{ .powerpc, 8 },
.{ .powerpc64, 16 },
.{ .aarch64, 16 },
.{ .loongarch64, 16 },
.{ .s390x, 16 },
.{ .riscv32, 8 },
.{ .riscv64, 16 },
.{ .x86, 8 },
.{ .x86_64, 16 },
};
inline for (map) |item| {
const arch = item[0];
Expand All@@ -161,17 +188,21 @@ const MultiSym = struct {
}

fn isWeak64(ms: MultiSym) bool {
// std.elf.STB_*
const map = .{
.{ .riscv32, 1 },
.{ .riscv64, 2 },
.{ .arm, 1 },
.{ .aarch64, 2 },
.{ .loongarch64, 2 },
.{ .m68k, 1 },
.{ .mips, 1 },
.{ .mips64, 2 },
.{ .x86, 1 },
.{ .x86_64, 2 },
.{ .powerpc, 1 },
.{ .powerpc64, 2 },
.{ .aarch64, 2 },
.{ .loongarch64, 2 },
.{ .riscv32, 1 },
.{ .riscv64, 2 },
.{ .s390x, 2 },
.{ .x86, 1 },
.{ .x86_64, 2 },
};
inline for (map) |item| {
const arch = item[0];
Expand DownExpand Up@@ -593,16 +624,19 @@ fn parseElf(parse: Parse, comptime is_64: bool, comptime endian: builtin.Endian)
fn archIndex(arch: std.Target.Cpu.Arch) u8 {
return switch (arch) {
// zig fmt: off
.riscv64 => 0,

@alexrpalexrpAug 4, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm unsure if the the indexes that were assigned here previously had significance. If they did, I can revert this part and add the new arches at 10-12.

.mips => 1,
.mips64 => 2,
.x86 => 3,
.x86_64 => 4,
.powerpc => 5,
.powerpc64 => 6,
.aarch64 => 7,
.arm => 0,
.aarch64 => 1,
.loongarch64 => 2,
.m68k => 3,
.mips => 4,
.mips64 => 5,
.powerpc => 6,
.powerpc64 => 7,
.riscv32 => 8,
.loongarch64 => 9,
.riscv64 => 9,
.s390x => 10,
.x86 => 11,
.x86_64 => 12,
else => unreachable,
// zig fmt: on
};
Expand All@@ -611,16 +645,19 @@ fn archIndex(arch: std.Target.Cpu.Arch) u8 {
fn archMuslName(arch: std.Target.Cpu.Arch) []const u8 {
return switch (arch) {
// zig fmt: off
.riscv64 => "riscv64",
.arm => "arm",
.aarch64 => "aarch64",
.loongarch64 => "loongarch64",
.m68k => "m68k",
.mips => "mips",
.mips64 => "mips64",
.x86 => "i386",
.x86_64 => "x86_64",
.powerpc => "powerpc",
.powerpc64 => "powerpc64",
.aarch64 => "aarch64",
.riscv32 => "riscv32",
.loongarch64 => "loongarch64",
.riscv64 => "riscv64",
.s390x => "s390x",
.x86 => "i386",
.x86_64 => "x86_64",
else => unreachable,
// zig fmt: on
};
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
gen_stubs: Add complete coverage for all (non-ILP32) arches.#20943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexrp
wants to merge
1
commit into

from

 Closed

gen_stubs: Add complete coverage for all (non-ILP32) arches.
#20943
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


137 changes: 87 additions & 50 deletions
tools/gen_stubs.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,23 +2,38 @@
//! ./gen_stubs /path/to/musl/build-all >libc.S
//!
//! The directory 'build-all' is expected to contain these subdirectories:
//! arm x86 mips mips64 powerpc powerpc64 riscv32 riscv64 x86_64 loongarch64
//! - arm
//! - aarch64
//! - loongarch64
//! - m68k
//! - mips
//! - mips64
//! - powerpc
//! - powerpc64
//! - riscv32
//! - riscv64
//! - s390x
//! - x86
//! - x86_64
//!
//! ...each with 'lib/libc.so' inside of them.
//!
//! When building the resulting libc.S file, these defines are required:
//! * `-DPTR64`: when the architecture is 64-bit
//! * One of the following, corresponding to the CPU architecture:
//! - `-DARCH_riscv32`
//! - `-DARCH_riscv64`
//! - `-DARCH_arm`
//! - `-DARCH_aarch64`
//! - `-DARCH_loongarch64`
//! - `-DARCH_m68k`
//! - `-DARCH_mips`
//! - `-DARCH_mips64`
//! - `-DARCH_i386`
//! - `-DARCH_x86_64`
//! - `-DARCH_powerpc`
//! - `-DARCH_powerpc64`
//! - `-DARCH_aarch64`
//! - `-DARCH_loongarch64`
//! - `-DARCH_riscv32`
//! - `-DARCH_riscv64`
//! - `-DARCH_s390x`
//! - `-DARCH_x86`
//! - `-DARCH_x86_64`

// TODO: pick the best index to put them into instead of at the end
// - e.g. find a common previous symbol and put it after that one
Expand All@@ -32,16 +47,19 @@ const elf = std.elf;
const native_endian = @import("builtin").target.cpu.arch.endian();

const inputs = .{
 .riscv32,
 .riscv64,
 .arm,
 .aarch64,
 .loongarch64,
 .m68k,
 .mips,
 .mips64,
 .x86,
 .x86_64,
 .powerpc,
 .powerpc64,
 .aarch64,
 .riscv32,
 .riscv64,
 .s390x,
 .x86,
 .x86_64,
};

const arches: [inputs.len]std.Target.Cpu.Arch = blk: {
Expand DownExpand Up@@ -70,16 +88,19 @@ const MultiSym = struct {
 }

 fn is32Only(ms: MultiSym) bool {
 return ms.present[archIndex(.riscv32)] == true and
 ms.present[archIndex(.riscv64)] == false and
 return ms.present[archIndex(.arm)] == true and
 ms.present[archIndex(.aarch64)] == false and
 ms.present[archIndex(.loongarch64)] == false and
 ms.present[archIndex(.m68k)] == true and
 ms.present[archIndex(.mips)] == true and
 ms.present[archIndex(.mips64)] == false and
 ms.present[archIndex(.x86)] == true and
 ms.present[archIndex(.x86_64)] == false and
 ms.present[archIndex(.powerpc)] == true and
 ms.present[archIndex(.powerpc64)] == false and
 ms.present[archIndex(.aarch64)] == false and
 ms.present[archIndex(.loongarch64)] == false;
 ms.present[archIndex(.riscv32)] == true and
 ms.present[archIndex(.riscv64)] == false and
 ms.present[archIndex(.s390x)] == false and
 ms.present[archIndex(.x86)] == true and
 ms.present[archIndex(.x86_64)] == false;
 }

 fn commonSize(ms: MultiSym) ?u64 {
Expand DownExpand Up@@ -114,16 +135,19 @@ const MultiSym = struct {

 fn isPtrSize(ms: MultiSym) bool {
 const map = .{
 .{ .riscv32, 4 },
 .{ .riscv64, 8 },
 .{ .arm, 4 },
 .{ .aarch64, 8 },
 .{ .loongarch64, 8 },
 .{ .m68k, 4 },
 .{ .mips, 4 },
 .{ .mips64, 8 },
 .{ .x86, 4 },
 .{ .x86_64, 8 },
 .{ .powerpc, 4 },
 .{ .powerpc64, 8 },
 .{ .aarch64, 8 },
 .{ .loongarch64, 8 },
 .{ .riscv32, 4 },
 .{ .riscv64, 8 },
 .{ .s390x, 8 },
 .{ .x86, 4 },
 .{ .x86_64, 8 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand All@@ -138,16 +162,19 @@ const MultiSym = struct {

 fn isPtr2Size(ms: MultiSym) bool {
 const map = .{
 .{ .riscv32, 8 },
 .{ .riscv64, 16 },
 .{ .arm, 8 },
 .{ .aarch64, 16 },
 .{ .loongarch64, 16 },
 .{ .m68k, 4 },
 .{ .mips, 8 },
 .{ .mips64, 16 },
 .{ .x86, 8 },
 .{ .x86_64, 16 },
 .{ .powerpc, 8 },
 .{ .powerpc64, 16 },
 .{ .aarch64, 16 },
 .{ .loongarch64, 16 },
 .{ .s390x, 16 },
 .{ .riscv32, 8 },
 .{ .riscv64, 16 },
 .{ .x86, 8 },
 .{ .x86_64, 16 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand All@@ -161,17 +188,21 @@ const MultiSym = struct {
 }

 fn isWeak64(ms: MultiSym) bool {
 // std.elf.STB_*
 const map = .{
 .{ .riscv32, 1 },
 .{ .riscv64, 2 },
 .{ .arm, 1 },
 .{ .aarch64, 2 },
 .{ .loongarch64, 2 },
 .{ .m68k, 1 },
 .{ .mips, 1 },
 .{ .mips64, 2 },
 .{ .x86, 1 },
 .{ .x86_64, 2 },
 .{ .powerpc, 1 },
 .{ .powerpc64, 2 },
 .{ .aarch64, 2 },
 .{ .loongarch64, 2 },
 .{ .riscv32, 1 },
 .{ .riscv64, 2 },
 .{ .s390x, 2 },
 .{ .x86, 1 },
 .{ .x86_64, 2 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand DownExpand Up@@ -593,16 +624,19 @@ fn parseElf(parse: Parse, comptime is_64: bool, comptime endian: builtin.Endian)
fn archIndex(arch: std.Target.Cpu.Arch) u8 {
 return switch (arch) {
 // zig fmt: off
 .riscv64 => 0,
@alexrpalexrpAug 4, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm unsure if the the indexes that were assigned here previously had significance. If they did, I can revert this part and add the new arches at 10-12.
 .mips  => 1,
 .mips64  => 2,
 .x86  => 3,
 .x86_64 => 4,
 .powerpc => 5,
 .powerpc64 => 6,
 .aarch64  => 7,
 .arm  => 0,
 .aarch64 => 1,
 .loongarch64 => 2,
 .m68k => 3,
 .mips  => 4,
 .mips64  => 5,
 .powerpc  => 6,
 .powerpc64 => 7,
 .riscv32 => 8,
 .loongarch64 => 9,
 .riscv64 => 9,
 .s390x => 10,
 .x86 => 11,
 .x86_64 => 12,
 else => unreachable,
 // zig fmt: on
 };
Expand All@@ -611,16 +645,19 @@ fn archIndex(arch: std.Target.Cpu.Arch) u8 {
fn archMuslName(arch: std.Target.Cpu.Arch) []const u8 {
 return switch (arch) {
 // zig fmt: off
 .riscv64 => "riscv64",
 .arm => "arm",
 .aarch64 => "aarch64",
 .loongarch64 => "loongarch64",
 .m68k => "m68k",
 .mips => "mips",
 .mips64 => "mips64",
 .x86 => "i386",
 .x86_64 => "x86_64",
 .powerpc => "powerpc",
 .powerpc64 => "powerpc64",
 .aarch64 => "aarch64",
 .riscv32 => "riscv32",
 .loongarch64 => "loongarch64",
 .riscv64 => "riscv64",
 .s390x => "s390x",
 .x86 => "i386",
 .x86_64 => "x86_64",
 else => unreachable,
 // zig fmt: on
 };
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
gen_stubs: Add complete coverage for all (non-ILP32) arches.#20943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexrp
wants to merge
1
commit into

from

 Closed

gen_stubs: Add complete coverage for all (non-ILP32) arches.
#20943
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


137 changes: 87 additions & 50 deletions
tools/gen_stubs.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,23 +2,38 @@
//! ./gen_stubs /path/to/musl/build-all >libc.S
//!
//! The directory 'build-all' is expected to contain these subdirectories:
//! arm x86 mips mips64 powerpc powerpc64 riscv32 riscv64 x86_64 loongarch64
//! - arm
//! - aarch64
//! - loongarch64
//! - m68k
//! - mips
//! - mips64
//! - powerpc
//! - powerpc64
//! - riscv32
//! - riscv64
//! - s390x
//! - x86
//! - x86_64
//!
//! ...each with 'lib/libc.so' inside of them.
//!
//! When building the resulting libc.S file, these defines are required:
//! * `-DPTR64`: when the architecture is 64-bit
//! * One of the following, corresponding to the CPU architecture:
//! - `-DARCH_riscv32`
//! - `-DARCH_riscv64`
//! - `-DARCH_arm`
//! - `-DARCH_aarch64`
//! - `-DARCH_loongarch64`
//! - `-DARCH_m68k`
//! - `-DARCH_mips`
//! - `-DARCH_mips64`
//! - `-DARCH_i386`
//! - `-DARCH_x86_64`
//! - `-DARCH_powerpc`
//! - `-DARCH_powerpc64`
//! - `-DARCH_aarch64`
//! - `-DARCH_loongarch64`
//! - `-DARCH_riscv32`
//! - `-DARCH_riscv64`
//! - `-DARCH_s390x`
//! - `-DARCH_x86`
//! - `-DARCH_x86_64`

// TODO: pick the best index to put them into instead of at the end
// - e.g. find a common previous symbol and put it after that one
Expand All@@ -32,16 +47,19 @@ const elf = std.elf;
const native_endian = @import("builtin").target.cpu.arch.endian();

const inputs = .{
 .riscv32,
 .riscv64,
 .arm,
 .aarch64,
 .loongarch64,
 .m68k,
 .mips,
 .mips64,
 .x86,
 .x86_64,
 .powerpc,
 .powerpc64,
 .aarch64,
 .riscv32,
 .riscv64,
 .s390x,
 .x86,
 .x86_64,
};

const arches: [inputs.len]std.Target.Cpu.Arch = blk: {
Expand DownExpand Up@@ -70,16 +88,19 @@ const MultiSym = struct {
 }

 fn is32Only(ms: MultiSym) bool {
 return ms.present[archIndex(.riscv32)] == true and
 ms.present[archIndex(.riscv64)] == false and
 return ms.present[archIndex(.arm)] == true and
 ms.present[archIndex(.aarch64)] == false and
 ms.present[archIndex(.loongarch64)] == false and
 ms.present[archIndex(.m68k)] == true and
 ms.present[archIndex(.mips)] == true and
 ms.present[archIndex(.mips64)] == false and
 ms.present[archIndex(.x86)] == true and
 ms.present[archIndex(.x86_64)] == false and
 ms.present[archIndex(.powerpc)] == true and
 ms.present[archIndex(.powerpc64)] == false and
 ms.present[archIndex(.aarch64)] == false and
 ms.present[archIndex(.loongarch64)] == false;
 ms.present[archIndex(.riscv32)] == true and
 ms.present[archIndex(.riscv64)] == false and
 ms.present[archIndex(.s390x)] == false and
 ms.present[archIndex(.x86)] == true and
 ms.present[archIndex(.x86_64)] == false;
 }

 fn commonSize(ms: MultiSym) ?u64 {
Expand DownExpand Up@@ -114,16 +135,19 @@ const MultiSym = struct {

 fn isPtrSize(ms: MultiSym) bool {
 const map = .{
 .{ .riscv32, 4 },
 .{ .riscv64, 8 },
 .{ .arm, 4 },
 .{ .aarch64, 8 },
 .{ .loongarch64, 8 },
 .{ .m68k, 4 },
 .{ .mips, 4 },
 .{ .mips64, 8 },
 .{ .x86, 4 },
 .{ .x86_64, 8 },
 .{ .powerpc, 4 },
 .{ .powerpc64, 8 },
 .{ .aarch64, 8 },
 .{ .loongarch64, 8 },
 .{ .riscv32, 4 },
 .{ .riscv64, 8 },
 .{ .s390x, 8 },
 .{ .x86, 4 },
 .{ .x86_64, 8 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand All@@ -138,16 +162,19 @@ const MultiSym = struct {

 fn isPtr2Size(ms: MultiSym) bool {
 const map = .{
 .{ .riscv32, 8 },
 .{ .riscv64, 16 },
 .{ .arm, 8 },
 .{ .aarch64, 16 },
 .{ .loongarch64, 16 },
 .{ .m68k, 4 },
 .{ .mips, 8 },
 .{ .mips64, 16 },
 .{ .x86, 8 },
 .{ .x86_64, 16 },
 .{ .powerpc, 8 },
 .{ .powerpc64, 16 },
 .{ .aarch64, 16 },
 .{ .loongarch64, 16 },
 .{ .s390x, 16 },
 .{ .riscv32, 8 },
 .{ .riscv64, 16 },
 .{ .x86, 8 },
 .{ .x86_64, 16 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand All@@ -161,17 +188,21 @@ const MultiSym = struct {
 }

 fn isWeak64(ms: MultiSym) bool {
 // std.elf.STB_*
 const map = .{
 .{ .riscv32, 1 },
 .{ .riscv64, 2 },
 .{ .arm, 1 },
 .{ .aarch64, 2 },
 .{ .loongarch64, 2 },
 .{ .m68k, 1 },
 .{ .mips, 1 },
 .{ .mips64, 2 },
 .{ .x86, 1 },
 .{ .x86_64, 2 },
 .{ .powerpc, 1 },
 .{ .powerpc64, 2 },
 .{ .aarch64, 2 },
 .{ .loongarch64, 2 },
 .{ .riscv32, 1 },
 .{ .riscv64, 2 },
 .{ .s390x, 2 },
 .{ .x86, 1 },
 .{ .x86_64, 2 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand DownExpand Up@@ -593,16 +624,19 @@ fn parseElf(parse: Parse, comptime is_64: bool, comptime endian: builtin.Endian)
fn archIndex(arch: std.Target.Cpu.Arch) u8 {
 return switch (arch) {
 // zig fmt: off
 .riscv64 => 0,
@alexrpalexrpAug 4, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm unsure if the the indexes that were assigned here previously had significance. If they did, I can revert this part and add the new arches at 10-12.
 .mips  => 1,
 .mips64  => 2,
 .x86  => 3,
 .x86_64 => 4,
 .powerpc => 5,
 .powerpc64 => 6,
 .aarch64  => 7,
 .arm  => 0,
 .aarch64 => 1,
 .loongarch64 => 2,
 .m68k => 3,
 .mips  => 4,
 .mips64  => 5,
 .powerpc  => 6,
 .powerpc64 => 7,
 .riscv32 => 8,
 .loongarch64 => 9,
 .riscv64 => 9,
 .s390x => 10,
 .x86 => 11,
 .x86_64 => 12,
 else => unreachable,
 // zig fmt: on
 };
Expand All@@ -611,16 +645,19 @@ fn archIndex(arch: std.Target.Cpu.Arch) u8 {
fn archMuslName(arch: std.Target.Cpu.Arch) []const u8 {
 return switch (arch) {
 // zig fmt: off
 .riscv64 => "riscv64",
 .arm => "arm",
 .aarch64 => "aarch64",
 .loongarch64 => "loongarch64",
 .m68k => "m68k",
 .mips => "mips",
 .mips64 => "mips64",
 .x86 => "i386",
 .x86_64 => "x86_64",
 .powerpc => "powerpc",
 .powerpc64 => "powerpc64",
 .aarch64 => "aarch64",
 .riscv32 => "riscv32",
 .loongarch64 => "loongarch64",
 .riscv64 => "riscv64",
 .s390x => "s390x",
 .x86 => "i386",
 .x86_64 => "x86_64",
 else => unreachable,
 // zig fmt: on
 };
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
gen_stubs: Add complete coverage for all (non-ILP32) arches.#20943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexrp
wants to merge
1
commit into

from

 Closed

gen_stubs: Add complete coverage for all (non-ILP32) arches.
#20943
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


137 changes: 87 additions & 50 deletions
tools/gen_stubs.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,23 +2,38 @@
//! ./gen_stubs /path/to/musl/build-all >libc.S
//!
//! The directory 'build-all' is expected to contain these subdirectories:
//! arm x86 mips mips64 powerpc powerpc64 riscv32 riscv64 x86_64 loongarch64
//! - arm
//! - aarch64
//! - loongarch64
//! - m68k
//! - mips
//! - mips64
//! - powerpc
//! - powerpc64
//! - riscv32
//! - riscv64
//! - s390x
//! - x86
//! - x86_64
//!
//! ...each with 'lib/libc.so' inside of them.
//!
//! When building the resulting libc.S file, these defines are required:
//! * `-DPTR64`: when the architecture is 64-bit
//! * One of the following, corresponding to the CPU architecture:
//! - `-DARCH_riscv32`
//! - `-DARCH_riscv64`
//! - `-DARCH_arm`
//! - `-DARCH_aarch64`
//! - `-DARCH_loongarch64`
//! - `-DARCH_m68k`
//! - `-DARCH_mips`
//! - `-DARCH_mips64`
//! - `-DARCH_i386`
//! - `-DARCH_x86_64`
//! - `-DARCH_powerpc`
//! - `-DARCH_powerpc64`
//! - `-DARCH_aarch64`
//! - `-DARCH_loongarch64`
//! - `-DARCH_riscv32`
//! - `-DARCH_riscv64`
//! - `-DARCH_s390x`
//! - `-DARCH_x86`
//! - `-DARCH_x86_64`

// TODO: pick the best index to put them into instead of at the end
// - e.g. find a common previous symbol and put it after that one
Expand All@@ -32,16 +47,19 @@ const elf = std.elf;
const native_endian = @import("builtin").target.cpu.arch.endian();

const inputs = .{
 .riscv32,
 .riscv64,
 .arm,
 .aarch64,
 .loongarch64,
 .m68k,
 .mips,
 .mips64,
 .x86,
 .x86_64,
 .powerpc,
 .powerpc64,
 .aarch64,
 .riscv32,
 .riscv64,
 .s390x,
 .x86,
 .x86_64,
};

const arches: [inputs.len]std.Target.Cpu.Arch = blk: {
Expand DownExpand Up@@ -70,16 +88,19 @@ const MultiSym = struct {
 }

 fn is32Only(ms: MultiSym) bool {
 return ms.present[archIndex(.riscv32)] == true and
 ms.present[archIndex(.riscv64)] == false and
 return ms.present[archIndex(.arm)] == true and
 ms.present[archIndex(.aarch64)] == false and
 ms.present[archIndex(.loongarch64)] == false and
 ms.present[archIndex(.m68k)] == true and
 ms.present[archIndex(.mips)] == true and
 ms.present[archIndex(.mips64)] == false and
 ms.present[archIndex(.x86)] == true and
 ms.present[archIndex(.x86_64)] == false and
 ms.present[archIndex(.powerpc)] == true and
 ms.present[archIndex(.powerpc64)] == false and
 ms.present[archIndex(.aarch64)] == false and
 ms.present[archIndex(.loongarch64)] == false;
 ms.present[archIndex(.riscv32)] == true and
 ms.present[archIndex(.riscv64)] == false and
 ms.present[archIndex(.s390x)] == false and
 ms.present[archIndex(.x86)] == true and
 ms.present[archIndex(.x86_64)] == false;
 }

 fn commonSize(ms: MultiSym) ?u64 {
Expand DownExpand Up@@ -114,16 +135,19 @@ const MultiSym = struct {

 fn isPtrSize(ms: MultiSym) bool {
 const map = .{
 .{ .riscv32, 4 },
 .{ .riscv64, 8 },
 .{ .arm, 4 },
 .{ .aarch64, 8 },
 .{ .loongarch64, 8 },
 .{ .m68k, 4 },
 .{ .mips, 4 },
 .{ .mips64, 8 },
 .{ .x86, 4 },
 .{ .x86_64, 8 },
 .{ .powerpc, 4 },
 .{ .powerpc64, 8 },
 .{ .aarch64, 8 },
 .{ .loongarch64, 8 },
 .{ .riscv32, 4 },
 .{ .riscv64, 8 },
 .{ .s390x, 8 },
 .{ .x86, 4 },
 .{ .x86_64, 8 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand All@@ -138,16 +162,19 @@ const MultiSym = struct {

 fn isPtr2Size(ms: MultiSym) bool {
 const map = .{
 .{ .riscv32, 8 },
 .{ .riscv64, 16 },
 .{ .arm, 8 },
 .{ .aarch64, 16 },
 .{ .loongarch64, 16 },
 .{ .m68k, 4 },
 .{ .mips, 8 },
 .{ .mips64, 16 },
 .{ .x86, 8 },
 .{ .x86_64, 16 },
 .{ .powerpc, 8 },
 .{ .powerpc64, 16 },
 .{ .aarch64, 16 },
 .{ .loongarch64, 16 },
 .{ .s390x, 16 },
 .{ .riscv32, 8 },
 .{ .riscv64, 16 },
 .{ .x86, 8 },
 .{ .x86_64, 16 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand All@@ -161,17 +188,21 @@ const MultiSym = struct {
 }

 fn isWeak64(ms: MultiSym) bool {
 // std.elf.STB_*
 const map = .{
 .{ .riscv32, 1 },
 .{ .riscv64, 2 },
 .{ .arm, 1 },
 .{ .aarch64, 2 },
 .{ .loongarch64, 2 },
 .{ .m68k, 1 },
 .{ .mips, 1 },
 .{ .mips64, 2 },
 .{ .x86, 1 },
 .{ .x86_64, 2 },
 .{ .powerpc, 1 },
 .{ .powerpc64, 2 },
 .{ .aarch64, 2 },
 .{ .loongarch64, 2 },
 .{ .riscv32, 1 },
 .{ .riscv64, 2 },
 .{ .s390x, 2 },
 .{ .x86, 1 },
 .{ .x86_64, 2 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand DownExpand Up@@ -593,16 +624,19 @@ fn parseElf(parse: Parse, comptime is_64: bool, comptime endian: builtin.Endian)
fn archIndex(arch: std.Target.Cpu.Arch) u8 {
 return switch (arch) {
 // zig fmt: off
 .riscv64 => 0,
@alexrpalexrpAug 4, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm unsure if the the indexes that were assigned here previously had significance. If they did, I can revert this part and add the new arches at 10-12.
 .mips  => 1,
 .mips64  => 2,
 .x86  => 3,
 .x86_64 => 4,
 .powerpc => 5,
 .powerpc64 => 6,
 .aarch64  => 7,
 .arm  => 0,
 .aarch64 => 1,
 .loongarch64 => 2,
 .m68k => 3,
 .mips  => 4,
 .mips64  => 5,
 .powerpc  => 6,
 .powerpc64 => 7,
 .riscv32 => 8,
 .loongarch64 => 9,
 .riscv64 => 9,
 .s390x => 10,
 .x86 => 11,
 .x86_64 => 12,
 else => unreachable,
 // zig fmt: on
 };
Expand All@@ -611,16 +645,19 @@ fn archIndex(arch: std.Target.Cpu.Arch) u8 {
fn archMuslName(arch: std.Target.Cpu.Arch) []const u8 {
 return switch (arch) {
 // zig fmt: off
 .riscv64 => "riscv64",
 .arm => "arm",
 .aarch64 => "aarch64",
 .loongarch64 => "loongarch64",
 .m68k => "m68k",
 .mips => "mips",
 .mips64 => "mips64",
 .x86 => "i386",
 .x86_64 => "x86_64",
 .powerpc => "powerpc",
 .powerpc64 => "powerpc64",
 .aarch64 => "aarch64",
 .riscv32 => "riscv32",
 .loongarch64 => "loongarch64",
 .riscv64 => "riscv64",
 .s390x => "s390x",
 .x86 => "i386",
 .x86_64 => "x86_64",
 else => unreachable,
 // zig fmt: on
 };
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
gen_stubs: Add complete coverage for all (non-ILP32) arches.#20943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexrp
wants to merge
1
commit into

from

 Closed

gen_stubs: Add complete coverage for all (non-ILP32) arches.
#20943
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


137 changes: 87 additions & 50 deletions
tools/gen_stubs.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,23 +2,38 @@
//! ./gen_stubs /path/to/musl/build-all >libc.S
//!
//! The directory 'build-all' is expected to contain these subdirectories:
//! arm x86 mips mips64 powerpc powerpc64 riscv32 riscv64 x86_64 loongarch64
//! - arm
//! - aarch64
//! - loongarch64
//! - m68k
//! - mips
//! - mips64
//! - powerpc
//! - powerpc64
//! - riscv32
//! - riscv64
//! - s390x
//! - x86
//! - x86_64
//!
//! ...each with 'lib/libc.so' inside of them.
//!
//! When building the resulting libc.S file, these defines are required:
//! * `-DPTR64`: when the architecture is 64-bit
//! * One of the following, corresponding to the CPU architecture:
//! - `-DARCH_riscv32`
//! - `-DARCH_riscv64`
//! - `-DARCH_arm`
//! - `-DARCH_aarch64`
//! - `-DARCH_loongarch64`
//! - `-DARCH_m68k`
//! - `-DARCH_mips`
//! - `-DARCH_mips64`
//! - `-DARCH_i386`
//! - `-DARCH_x86_64`
//! - `-DARCH_powerpc`
//! - `-DARCH_powerpc64`
//! - `-DARCH_aarch64`
//! - `-DARCH_loongarch64`
//! - `-DARCH_riscv32`
//! - `-DARCH_riscv64`
//! - `-DARCH_s390x`
//! - `-DARCH_x86`
//! - `-DARCH_x86_64`

// TODO: pick the best index to put them into instead of at the end
// - e.g. find a common previous symbol and put it after that one
Expand All@@ -32,16 +47,19 @@ const elf = std.elf;
const native_endian = @import("builtin").target.cpu.arch.endian();

const inputs = .{
 .riscv32,
 .riscv64,
 .arm,
 .aarch64,
 .loongarch64,
 .m68k,
 .mips,
 .mips64,
 .x86,
 .x86_64,
 .powerpc,
 .powerpc64,
 .aarch64,
 .riscv32,
 .riscv64,
 .s390x,
 .x86,
 .x86_64,
};

const arches: [inputs.len]std.Target.Cpu.Arch = blk: {
Expand DownExpand Up@@ -70,16 +88,19 @@ const MultiSym = struct {
 }

 fn is32Only(ms: MultiSym) bool {
 return ms.present[archIndex(.riscv32)] == true and
 ms.present[archIndex(.riscv64)] == false and
 return ms.present[archIndex(.arm)] == true and
 ms.present[archIndex(.aarch64)] == false and
 ms.present[archIndex(.loongarch64)] == false and
 ms.present[archIndex(.m68k)] == true and
 ms.present[archIndex(.mips)] == true and
 ms.present[archIndex(.mips64)] == false and
 ms.present[archIndex(.x86)] == true and
 ms.present[archIndex(.x86_64)] == false and
 ms.present[archIndex(.powerpc)] == true and
 ms.present[archIndex(.powerpc64)] == false and
 ms.present[archIndex(.aarch64)] == false and
 ms.present[archIndex(.loongarch64)] == false;
 ms.present[archIndex(.riscv32)] == true and
 ms.present[archIndex(.riscv64)] == false and
 ms.present[archIndex(.s390x)] == false and
 ms.present[archIndex(.x86)] == true and
 ms.present[archIndex(.x86_64)] == false;
 }

 fn commonSize(ms: MultiSym) ?u64 {
Expand DownExpand Up@@ -114,16 +135,19 @@ const MultiSym = struct {

 fn isPtrSize(ms: MultiSym) bool {
 const map = .{
 .{ .riscv32, 4 },
 .{ .riscv64, 8 },
 .{ .arm, 4 },
 .{ .aarch64, 8 },
 .{ .loongarch64, 8 },
 .{ .m68k, 4 },
 .{ .mips, 4 },
 .{ .mips64, 8 },
 .{ .x86, 4 },
 .{ .x86_64, 8 },
 .{ .powerpc, 4 },
 .{ .powerpc64, 8 },
 .{ .aarch64, 8 },
 .{ .loongarch64, 8 },
 .{ .riscv32, 4 },
 .{ .riscv64, 8 },
 .{ .s390x, 8 },
 .{ .x86, 4 },
 .{ .x86_64, 8 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand All@@ -138,16 +162,19 @@ const MultiSym = struct {

 fn isPtr2Size(ms: MultiSym) bool {
 const map = .{
 .{ .riscv32, 8 },
 .{ .riscv64, 16 },
 .{ .arm, 8 },
 .{ .aarch64, 16 },
 .{ .loongarch64, 16 },
 .{ .m68k, 4 },
 .{ .mips, 8 },
 .{ .mips64, 16 },
 .{ .x86, 8 },
 .{ .x86_64, 16 },
 .{ .powerpc, 8 },
 .{ .powerpc64, 16 },
 .{ .aarch64, 16 },
 .{ .loongarch64, 16 },
 .{ .s390x, 16 },
 .{ .riscv32, 8 },
 .{ .riscv64, 16 },
 .{ .x86, 8 },
 .{ .x86_64, 16 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand All@@ -161,17 +188,21 @@ const MultiSym = struct {
 }

 fn isWeak64(ms: MultiSym) bool {
 // std.elf.STB_*
 const map = .{
 .{ .riscv32, 1 },
 .{ .riscv64, 2 },
 .{ .arm, 1 },
 .{ .aarch64, 2 },
 .{ .loongarch64, 2 },
 .{ .m68k, 1 },
 .{ .mips, 1 },
 .{ .mips64, 2 },
 .{ .x86, 1 },
 .{ .x86_64, 2 },
 .{ .powerpc, 1 },
 .{ .powerpc64, 2 },
 .{ .aarch64, 2 },
 .{ .loongarch64, 2 },
 .{ .riscv32, 1 },
 .{ .riscv64, 2 },
 .{ .s390x, 2 },
 .{ .x86, 1 },
 .{ .x86_64, 2 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand DownExpand Up@@ -593,16 +624,19 @@ fn parseElf(parse: Parse, comptime is_64: bool, comptime endian: builtin.Endian)
fn archIndex(arch: std.Target.Cpu.Arch) u8 {
 return switch (arch) {
 // zig fmt: off
 .riscv64 => 0,
@alexrpalexrpAug 4, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm unsure if the the indexes that were assigned here previously had significance. If they did, I can revert this part and add the new arches at 10-12.
 .mips  => 1,
 .mips64  => 2,
 .x86  => 3,
 .x86_64 => 4,
 .powerpc => 5,
 .powerpc64 => 6,
 .aarch64  => 7,
 .arm  => 0,
 .aarch64 => 1,
 .loongarch64 => 2,
 .m68k => 3,
 .mips  => 4,
 .mips64  => 5,
 .powerpc  => 6,
 .powerpc64 => 7,
 .riscv32 => 8,
 .loongarch64 => 9,
 .riscv64 => 9,
 .s390x => 10,
 .x86 => 11,
 .x86_64 => 12,
 else => unreachable,
 // zig fmt: on
 };
Expand All@@ -611,16 +645,19 @@ fn archIndex(arch: std.Target.Cpu.Arch) u8 {
fn archMuslName(arch: std.Target.Cpu.Arch) []const u8 {
 return switch (arch) {
 // zig fmt: off
 .riscv64 => "riscv64",
 .arm => "arm",
 .aarch64 => "aarch64",
 .loongarch64 => "loongarch64",
 .m68k => "m68k",
 .mips => "mips",
 .mips64 => "mips64",
 .x86 => "i386",
 .x86_64 => "x86_64",
 .powerpc => "powerpc",
 .powerpc64 => "powerpc64",
 .aarch64 => "aarch64",
 .riscv32 => "riscv32",
 .loongarch64 => "loongarch64",
 .riscv64 => "riscv64",
 .s390x => "s390x",
 .x86 => "i386",
 .x86_64 => "x86_64",
 else => unreachable,
 // zig fmt: on
 };
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
gen_stubs: Add complete coverage for all (non-ILP32) arches.#20943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexrp
wants to merge
1
commit into

from

 Closed

gen_stubs: Add complete coverage for all (non-ILP32) arches.
#20943
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


137 changes: 87 additions & 50 deletions
tools/gen_stubs.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,23 +2,38 @@
//! ./gen_stubs /path/to/musl/build-all >libc.S
//!
//! The directory 'build-all' is expected to contain these subdirectories:
//! arm x86 mips mips64 powerpc powerpc64 riscv32 riscv64 x86_64 loongarch64
//! - arm
//! - aarch64
//! - loongarch64
//! - m68k
//! - mips
//! - mips64
//! - powerpc
//! - powerpc64
//! - riscv32
//! - riscv64
//! - s390x
//! - x86
//! - x86_64
//!
//! ...each with 'lib/libc.so' inside of them.
//!
//! When building the resulting libc.S file, these defines are required:
//! * `-DPTR64`: when the architecture is 64-bit
//! * One of the following, corresponding to the CPU architecture:
//! - `-DARCH_riscv32`
//! - `-DARCH_riscv64`
//! - `-DARCH_arm`
//! - `-DARCH_aarch64`
//! - `-DARCH_loongarch64`
//! - `-DARCH_m68k`
//! - `-DARCH_mips`
//! - `-DARCH_mips64`
//! - `-DARCH_i386`
//! - `-DARCH_x86_64`
//! - `-DARCH_powerpc`
//! - `-DARCH_powerpc64`
//! - `-DARCH_aarch64`
//! - `-DARCH_loongarch64`
//! - `-DARCH_riscv32`
//! - `-DARCH_riscv64`
//! - `-DARCH_s390x`
//! - `-DARCH_x86`
//! - `-DARCH_x86_64`

// TODO: pick the best index to put them into instead of at the end
// - e.g. find a common previous symbol and put it after that one
Expand All@@ -32,16 +47,19 @@ const elf = std.elf;
const native_endian = @import("builtin").target.cpu.arch.endian();

const inputs = .{
 .riscv32,
 .riscv64,
 .arm,
 .aarch64,
 .loongarch64,
 .m68k,
 .mips,
 .mips64,
 .x86,
 .x86_64,
 .powerpc,
 .powerpc64,
 .aarch64,
 .riscv32,
 .riscv64,
 .s390x,
 .x86,
 .x86_64,
};

const arches: [inputs.len]std.Target.Cpu.Arch = blk: {
Expand DownExpand Up@@ -70,16 +88,19 @@ const MultiSym = struct {
 }

 fn is32Only(ms: MultiSym) bool {
 return ms.present[archIndex(.riscv32)] == true and
 ms.present[archIndex(.riscv64)] == false and
 return ms.present[archIndex(.arm)] == true and
 ms.present[archIndex(.aarch64)] == false and
 ms.present[archIndex(.loongarch64)] == false and
 ms.present[archIndex(.m68k)] == true and
 ms.present[archIndex(.mips)] == true and
 ms.present[archIndex(.mips64)] == false and
 ms.present[archIndex(.x86)] == true and
 ms.present[archIndex(.x86_64)] == false and
 ms.present[archIndex(.powerpc)] == true and
 ms.present[archIndex(.powerpc64)] == false and
 ms.present[archIndex(.aarch64)] == false and
 ms.present[archIndex(.loongarch64)] == false;
 ms.present[archIndex(.riscv32)] == true and
 ms.present[archIndex(.riscv64)] == false and
 ms.present[archIndex(.s390x)] == false and
 ms.present[archIndex(.x86)] == true and
 ms.present[archIndex(.x86_64)] == false;
 }

 fn commonSize(ms: MultiSym) ?u64 {
Expand DownExpand Up@@ -114,16 +135,19 @@ const MultiSym = struct {

 fn isPtrSize(ms: MultiSym) bool {
 const map = .{
 .{ .riscv32, 4 },
 .{ .riscv64, 8 },
 .{ .arm, 4 },
 .{ .aarch64, 8 },
 .{ .loongarch64, 8 },
 .{ .m68k, 4 },
 .{ .mips, 4 },
 .{ .mips64, 8 },
 .{ .x86, 4 },
 .{ .x86_64, 8 },
 .{ .powerpc, 4 },
 .{ .powerpc64, 8 },
 .{ .aarch64, 8 },
 .{ .loongarch64, 8 },
 .{ .riscv32, 4 },
 .{ .riscv64, 8 },
 .{ .s390x, 8 },
 .{ .x86, 4 },
 .{ .x86_64, 8 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand All@@ -138,16 +162,19 @@ const MultiSym = struct {

 fn isPtr2Size(ms: MultiSym) bool {
 const map = .{
 .{ .riscv32, 8 },
 .{ .riscv64, 16 },
 .{ .arm, 8 },
 .{ .aarch64, 16 },
 .{ .loongarch64, 16 },
 .{ .m68k, 4 },
 .{ .mips, 8 },
 .{ .mips64, 16 },
 .{ .x86, 8 },
 .{ .x86_64, 16 },
 .{ .powerpc, 8 },
 .{ .powerpc64, 16 },
 .{ .aarch64, 16 },
 .{ .loongarch64, 16 },
 .{ .s390x, 16 },
 .{ .riscv32, 8 },
 .{ .riscv64, 16 },
 .{ .x86, 8 },
 .{ .x86_64, 16 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand All@@ -161,17 +188,21 @@ const MultiSym = struct {
 }

 fn isWeak64(ms: MultiSym) bool {
 // std.elf.STB_*
 const map = .{
 .{ .riscv32, 1 },
 .{ .riscv64, 2 },
 .{ .arm, 1 },
 .{ .aarch64, 2 },
 .{ .loongarch64, 2 },
 .{ .m68k, 1 },
 .{ .mips, 1 },
 .{ .mips64, 2 },
 .{ .x86, 1 },
 .{ .x86_64, 2 },
 .{ .powerpc, 1 },
 .{ .powerpc64, 2 },
 .{ .aarch64, 2 },
 .{ .loongarch64, 2 },
 .{ .riscv32, 1 },
 .{ .riscv64, 2 },
 .{ .s390x, 2 },
 .{ .x86, 1 },
 .{ .x86_64, 2 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand DownExpand Up@@ -593,16 +624,19 @@ fn parseElf(parse: Parse, comptime is_64: bool, comptime endian: builtin.Endian)
fn archIndex(arch: std.Target.Cpu.Arch) u8 {
 return switch (arch) {
 // zig fmt: off
 .riscv64 => 0,
@alexrpalexrpAug 4, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm unsure if the the indexes that were assigned here previously had significance. If they did, I can revert this part and add the new arches at 10-12.
 .mips  => 1,
 .mips64  => 2,
 .x86  => 3,
 .x86_64 => 4,
 .powerpc => 5,
 .powerpc64 => 6,
 .aarch64  => 7,
 .arm  => 0,
 .aarch64 => 1,
 .loongarch64 => 2,
 .m68k => 3,
 .mips  => 4,
 .mips64  => 5,
 .powerpc  => 6,
 .powerpc64 => 7,
 .riscv32 => 8,
 .loongarch64 => 9,
 .riscv64 => 9,
 .s390x => 10,
 .x86 => 11,
 .x86_64 => 12,
 else => unreachable,
 // zig fmt: on
 };
Expand All@@ -611,16 +645,19 @@ fn archIndex(arch: std.Target.Cpu.Arch) u8 {
fn archMuslName(arch: std.Target.Cpu.Arch) []const u8 {
 return switch (arch) {
 // zig fmt: off
 .riscv64 => "riscv64",
 .arm => "arm",
 .aarch64 => "aarch64",
 .loongarch64 => "loongarch64",
 .m68k => "m68k",
 .mips => "mips",
 .mips64 => "mips64",
 .x86 => "i386",
 .x86_64 => "x86_64",
 .powerpc => "powerpc",
 .powerpc64 => "powerpc64",
 .aarch64 => "aarch64",
 .riscv32 => "riscv32",
 .loongarch64 => "loongarch64",
 .riscv64 => "riscv64",
 .s390x => "s390x",
 .x86 => "i386",
 .x86_64 => "x86_64",
 else => unreachable,
 // zig fmt: on
 };
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
gen_stubs: Add complete coverage for all (non-ILP32) arches.#20943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexrp
wants to merge
1
commit into

from

 Closed

gen_stubs: Add complete coverage for all (non-ILP32) arches.
#20943
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


137 changes: 87 additions & 50 deletions
tools/gen_stubs.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,23 +2,38 @@
//! ./gen_stubs /path/to/musl/build-all >libc.S
//!
//! The directory 'build-all' is expected to contain these subdirectories:
//! arm x86 mips mips64 powerpc powerpc64 riscv32 riscv64 x86_64 loongarch64
//! - arm
//! - aarch64
//! - loongarch64
//! - m68k
//! - mips
//! - mips64
//! - powerpc
//! - powerpc64
//! - riscv32
//! - riscv64
//! - s390x
//! - x86
//! - x86_64
//!
//! ...each with 'lib/libc.so' inside of them.
//!
//! When building the resulting libc.S file, these defines are required:
//! * `-DPTR64`: when the architecture is 64-bit
//! * One of the following, corresponding to the CPU architecture:
//! - `-DARCH_riscv32`
//! - `-DARCH_riscv64`
//! - `-DARCH_arm`
//! - `-DARCH_aarch64`
//! - `-DARCH_loongarch64`
//! - `-DARCH_m68k`
//! - `-DARCH_mips`
//! - `-DARCH_mips64`
//! - `-DARCH_i386`
//! - `-DARCH_x86_64`
//! - `-DARCH_powerpc`
//! - `-DARCH_powerpc64`
//! - `-DARCH_aarch64`
//! - `-DARCH_loongarch64`
//! - `-DARCH_riscv32`
//! - `-DARCH_riscv64`
//! - `-DARCH_s390x`
//! - `-DARCH_x86`
//! - `-DARCH_x86_64`

// TODO: pick the best index to put them into instead of at the end
// - e.g. find a common previous symbol and put it after that one
Expand All@@ -32,16 +47,19 @@ const elf = std.elf;
const native_endian = @import("builtin").target.cpu.arch.endian();

const inputs = .{
 .riscv32,
 .riscv64,
 .arm,
 .aarch64,
 .loongarch64,
 .m68k,
 .mips,
 .mips64,
 .x86,
 .x86_64,
 .powerpc,
 .powerpc64,
 .aarch64,
 .riscv32,
 .riscv64,
 .s390x,
 .x86,
 .x86_64,
};

const arches: [inputs.len]std.Target.Cpu.Arch = blk: {
Expand DownExpand Up@@ -70,16 +88,19 @@ const MultiSym = struct {
 }

 fn is32Only(ms: MultiSym) bool {
 return ms.present[archIndex(.riscv32)] == true and
 ms.present[archIndex(.riscv64)] == false and
 return ms.present[archIndex(.arm)] == true and
 ms.present[archIndex(.aarch64)] == false and
 ms.present[archIndex(.loongarch64)] == false and
 ms.present[archIndex(.m68k)] == true and
 ms.present[archIndex(.mips)] == true and
 ms.present[archIndex(.mips64)] == false and
 ms.present[archIndex(.x86)] == true and
 ms.present[archIndex(.x86_64)] == false and
 ms.present[archIndex(.powerpc)] == true and
 ms.present[archIndex(.powerpc64)] == false and
 ms.present[archIndex(.aarch64)] == false and
 ms.present[archIndex(.loongarch64)] == false;
 ms.present[archIndex(.riscv32)] == true and
 ms.present[archIndex(.riscv64)] == false and
 ms.present[archIndex(.s390x)] == false and
 ms.present[archIndex(.x86)] == true and
 ms.present[archIndex(.x86_64)] == false;
 }

 fn commonSize(ms: MultiSym) ?u64 {
Expand DownExpand Up@@ -114,16 +135,19 @@ const MultiSym = struct {

 fn isPtrSize(ms: MultiSym) bool {
 const map = .{
 .{ .riscv32, 4 },
 .{ .riscv64, 8 },
 .{ .arm, 4 },
 .{ .aarch64, 8 },
 .{ .loongarch64, 8 },
 .{ .m68k, 4 },
 .{ .mips, 4 },
 .{ .mips64, 8 },
 .{ .x86, 4 },
 .{ .x86_64, 8 },
 .{ .powerpc, 4 },
 .{ .powerpc64, 8 },
 .{ .aarch64, 8 },
 .{ .loongarch64, 8 },
 .{ .riscv32, 4 },
 .{ .riscv64, 8 },
 .{ .s390x, 8 },
 .{ .x86, 4 },
 .{ .x86_64, 8 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand All@@ -138,16 +162,19 @@ const MultiSym = struct {

 fn isPtr2Size(ms: MultiSym) bool {
 const map = .{
 .{ .riscv32, 8 },
 .{ .riscv64, 16 },
 .{ .arm, 8 },
 .{ .aarch64, 16 },
 .{ .loongarch64, 16 },
 .{ .m68k, 4 },
 .{ .mips, 8 },
 .{ .mips64, 16 },
 .{ .x86, 8 },
 .{ .x86_64, 16 },
 .{ .powerpc, 8 },
 .{ .powerpc64, 16 },
 .{ .aarch64, 16 },
 .{ .loongarch64, 16 },
 .{ .s390x, 16 },
 .{ .riscv32, 8 },
 .{ .riscv64, 16 },
 .{ .x86, 8 },
 .{ .x86_64, 16 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand All@@ -161,17 +188,21 @@ const MultiSym = struct {
 }

 fn isWeak64(ms: MultiSym) bool {
 // std.elf.STB_*
 const map = .{
 .{ .riscv32, 1 },
 .{ .riscv64, 2 },
 .{ .arm, 1 },
 .{ .aarch64, 2 },
 .{ .loongarch64, 2 },
 .{ .m68k, 1 },
 .{ .mips, 1 },
 .{ .mips64, 2 },
 .{ .x86, 1 },
 .{ .x86_64, 2 },
 .{ .powerpc, 1 },
 .{ .powerpc64, 2 },
 .{ .aarch64, 2 },
 .{ .loongarch64, 2 },
 .{ .riscv32, 1 },
 .{ .riscv64, 2 },
 .{ .s390x, 2 },
 .{ .x86, 1 },
 .{ .x86_64, 2 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand DownExpand Up@@ -593,16 +624,19 @@ fn parseElf(parse: Parse, comptime is_64: bool, comptime endian: builtin.Endian)
fn archIndex(arch: std.Target.Cpu.Arch) u8 {
 return switch (arch) {
 // zig fmt: off
 .riscv64 => 0,
@alexrpalexrpAug 4, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm unsure if the the indexes that were assigned here previously had significance. If they did, I can revert this part and add the new arches at 10-12.
 .mips  => 1,
 .mips64  => 2,
 .x86  => 3,
 .x86_64 => 4,
 .powerpc => 5,
 .powerpc64 => 6,
 .aarch64  => 7,
 .arm  => 0,
 .aarch64 => 1,
 .loongarch64 => 2,
 .m68k => 3,
 .mips  => 4,
 .mips64  => 5,
 .powerpc  => 6,
 .powerpc64 => 7,
 .riscv32 => 8,
 .loongarch64 => 9,
 .riscv64 => 9,
 .s390x => 10,
 .x86 => 11,
 .x86_64 => 12,
 else => unreachable,
 // zig fmt: on
 };
Expand All@@ -611,16 +645,19 @@ fn archIndex(arch: std.Target.Cpu.Arch) u8 {
fn archMuslName(arch: std.Target.Cpu.Arch) []const u8 {
 return switch (arch) {
 // zig fmt: off
 .riscv64 => "riscv64",
 .arm => "arm",
 .aarch64 => "aarch64",
 .loongarch64 => "loongarch64",
 .m68k => "m68k",
 .mips => "mips",
 .mips64 => "mips64",
 .x86 => "i386",
 .x86_64 => "x86_64",
 .powerpc => "powerpc",
 .powerpc64 => "powerpc64",
 .aarch64 => "aarch64",
 .riscv32 => "riscv32",
 .loongarch64 => "loongarch64",
 .riscv64 => "riscv64",
 .s390x => "s390x",
 .x86 => "i386",
 .x86_64 => "x86_64",
 else => unreachable,
 // zig fmt: on
 };
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
gen_stubs: Add complete coverage for all (non-ILP32) arches.#20943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexrp
wants to merge
1
commit into

from

 Closed

gen_stubs: Add complete coverage for all (non-ILP32) arches.
#20943
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


137 changes: 87 additions & 50 deletions
tools/gen_stubs.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,23 +2,38 @@
//! ./gen_stubs /path/to/musl/build-all >libc.S
//!
//! The directory 'build-all' is expected to contain these subdirectories:
//! arm x86 mips mips64 powerpc powerpc64 riscv32 riscv64 x86_64 loongarch64
//! - arm
//! - aarch64
//! - loongarch64
//! - m68k
//! - mips
//! - mips64
//! - powerpc
//! - powerpc64
//! - riscv32
//! - riscv64
//! - s390x
//! - x86
//! - x86_64
//!
//! ...each with 'lib/libc.so' inside of them.
//!
//! When building the resulting libc.S file, these defines are required:
//! * `-DPTR64`: when the architecture is 64-bit
//! * One of the following, corresponding to the CPU architecture:
//! - `-DARCH_riscv32`
//! - `-DARCH_riscv64`
//! - `-DARCH_arm`
//! - `-DARCH_aarch64`
//! - `-DARCH_loongarch64`
//! - `-DARCH_m68k`
//! - `-DARCH_mips`
//! - `-DARCH_mips64`
//! - `-DARCH_i386`
//! - `-DARCH_x86_64`
//! - `-DARCH_powerpc`
//! - `-DARCH_powerpc64`
//! - `-DARCH_aarch64`
//! - `-DARCH_loongarch64`
//! - `-DARCH_riscv32`
//! - `-DARCH_riscv64`
//! - `-DARCH_s390x`
//! - `-DARCH_x86`
//! - `-DARCH_x86_64`

// TODO: pick the best index to put them into instead of at the end
// - e.g. find a common previous symbol and put it after that one
Expand All@@ -32,16 +47,19 @@ const elf = std.elf;
const native_endian = @import("builtin").target.cpu.arch.endian();

const inputs = .{
 .riscv32,
 .riscv64,
 .arm,
 .aarch64,
 .loongarch64,
 .m68k,
 .mips,
 .mips64,
 .x86,
 .x86_64,
 .powerpc,
 .powerpc64,
 .aarch64,
 .riscv32,
 .riscv64,
 .s390x,
 .x86,
 .x86_64,
};

const arches: [inputs.len]std.Target.Cpu.Arch = blk: {
Expand DownExpand Up@@ -70,16 +88,19 @@ const MultiSym = struct {
 }

 fn is32Only(ms: MultiSym) bool {
 return ms.present[archIndex(.riscv32)] == true and
 ms.present[archIndex(.riscv64)] == false and
 return ms.present[archIndex(.arm)] == true and
 ms.present[archIndex(.aarch64)] == false and
 ms.present[archIndex(.loongarch64)] == false and
 ms.present[archIndex(.m68k)] == true and
 ms.present[archIndex(.mips)] == true and
 ms.present[archIndex(.mips64)] == false and
 ms.present[archIndex(.x86)] == true and
 ms.present[archIndex(.x86_64)] == false and
 ms.present[archIndex(.powerpc)] == true and
 ms.present[archIndex(.powerpc64)] == false and
 ms.present[archIndex(.aarch64)] == false and
 ms.present[archIndex(.loongarch64)] == false;
 ms.present[archIndex(.riscv32)] == true and
 ms.present[archIndex(.riscv64)] == false and
 ms.present[archIndex(.s390x)] == false and
 ms.present[archIndex(.x86)] == true and
 ms.present[archIndex(.x86_64)] == false;
 }

 fn commonSize(ms: MultiSym) ?u64 {
Expand DownExpand Up@@ -114,16 +135,19 @@ const MultiSym = struct {

 fn isPtrSize(ms: MultiSym) bool {
 const map = .{
 .{ .riscv32, 4 },
 .{ .riscv64, 8 },
 .{ .arm, 4 },
 .{ .aarch64, 8 },
 .{ .loongarch64, 8 },
 .{ .m68k, 4 },
 .{ .mips, 4 },
 .{ .mips64, 8 },
 .{ .x86, 4 },
 .{ .x86_64, 8 },
 .{ .powerpc, 4 },
 .{ .powerpc64, 8 },
 .{ .aarch64, 8 },
 .{ .loongarch64, 8 },
 .{ .riscv32, 4 },
 .{ .riscv64, 8 },
 .{ .s390x, 8 },
 .{ .x86, 4 },
 .{ .x86_64, 8 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand All@@ -138,16 +162,19 @@ const MultiSym = struct {

 fn isPtr2Size(ms: MultiSym) bool {
 const map = .{
 .{ .riscv32, 8 },
 .{ .riscv64, 16 },
 .{ .arm, 8 },
 .{ .aarch64, 16 },
 .{ .loongarch64, 16 },
 .{ .m68k, 4 },
 .{ .mips, 8 },
 .{ .mips64, 16 },
 .{ .x86, 8 },
 .{ .x86_64, 16 },
 .{ .powerpc, 8 },
 .{ .powerpc64, 16 },
 .{ .aarch64, 16 },
 .{ .loongarch64, 16 },
 .{ .s390x, 16 },
 .{ .riscv32, 8 },
 .{ .riscv64, 16 },
 .{ .x86, 8 },
 .{ .x86_64, 16 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand All@@ -161,17 +188,21 @@ const MultiSym = struct {
 }

 fn isWeak64(ms: MultiSym) bool {
 // std.elf.STB_*
 const map = .{
 .{ .riscv32, 1 },
 .{ .riscv64, 2 },
 .{ .arm, 1 },
 .{ .aarch64, 2 },
 .{ .loongarch64, 2 },
 .{ .m68k, 1 },
 .{ .mips, 1 },
 .{ .mips64, 2 },
 .{ .x86, 1 },
 .{ .x86_64, 2 },
 .{ .powerpc, 1 },
 .{ .powerpc64, 2 },
 .{ .aarch64, 2 },
 .{ .loongarch64, 2 },
 .{ .riscv32, 1 },
 .{ .riscv64, 2 },
 .{ .s390x, 2 },
 .{ .x86, 1 },
 .{ .x86_64, 2 },
 };
 inline for (map) |item| {
 const arch = item[0];
Expand DownExpand Up@@ -593,16 +624,19 @@ fn parseElf(parse: Parse, comptime is_64: bool, comptime endian: builtin.Endian)
fn archIndex(arch: std.Target.Cpu.Arch) u8 {
 return switch (arch) {
 // zig fmt: off
 .riscv64 => 0,
@alexrpalexrpAug 4, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm unsure if the the indexes that were assigned here previously had significance. If they did, I can revert this part and add the new arches at 10-12.
 .mips  => 1,
 .mips64  => 2,
 .x86  => 3,
 .x86_64 => 4,
 .powerpc => 5,
 .powerpc64 => 6,
 .aarch64  => 7,
 .arm  => 0,
 .aarch64 => 1,
 .loongarch64 => 2,
 .m68k => 3,
 .mips  => 4,
 .mips64  => 5,
 .powerpc  => 6,
 .powerpc64 => 7,
 .riscv32 => 8,
 .loongarch64 => 9,
 .riscv64 => 9,
 .s390x => 10,
 .x86 => 11,
 .x86_64 => 12,
 else => unreachable,
 // zig fmt: on
 };
Expand All@@ -611,16 +645,19 @@ fn archIndex(arch: std.Target.Cpu.Arch) u8 {
fn archMuslName(arch: std.Target.Cpu.Arch) []const u8 {
 return switch (arch) {
 // zig fmt: off
 .riscv64 => "riscv64",
 .arm => "arm",
 .aarch64 => "aarch64",
 .loongarch64 => "loongarch64",
 .m68k => "m68k",
 .mips => "mips",
 .mips64 => "mips64",
 .x86 => "i386",
 .x86_64 => "x86_64",
 .powerpc => "powerpc",
 .powerpc64 => "powerpc64",
 .aarch64 => "aarch64",
 .riscv32 => "riscv32",
 .loongarch64 => "loongarch64",
 .riscv64 => "riscv64",
 .s390x => "s390x",
 .x86 => "i386",
 .x86_64 => "x86_64",
 else => unreachable,
 // zig fmt: on
 };
Expand Down