Skip to content

std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.#21177

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

Merged
andrewrk merged 2 commits into from
Aug 25, 2024
Merged

std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions. #21177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a69f55a
std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.
alexrp Aug 19, 2024
fb6f5a3
link: Rename InvalidCpuArch error to InvalidMachineType.
alexrp Aug 23, 2024
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
17 changes: 0 additions & 17 deletions lib/std/coff.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1060,23 +1060,6 @@ pub const MachineType = enum(u16) {
WCEMIPSV2 = 0x169,

_,

pub fn toTargetCpuArch(machine_type: MachineType) ?std.Target.Cpu.Arch {
return switch (machine_type) {
.ARM => .arm,
.POWERPC => .powerpc,
.RISCV32 => .riscv32,
.THUMB => .thumb,
.I386 => .x86,
.ARM64 => .aarch64,
.RISCV64 => .riscv64,
.X64 => .x86_64,
.LOONGARCH32 => .loongarch32,
.LOONGARCH64 => .loongarch64,
// there's cases we don't (yet) handle
else => null,
};
}
};

pub const CoffError = error{
Expand Down
38 changes: 0 additions & 38 deletions lib/std/elf.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1646,44 +1646,6 @@ pub const EM = enum(u16) {
FRV = 0x5441,

_,

pub fn toTargetCpuArch(em: EM) ?std.Target.Cpu.Arch {
return switch (em) {
.AVR => .avr,
.MSP430 => .msp430,
.ARC => .arc,
.ARM => .arm,
.HEXAGON => .hexagon,
.@"68K" => .m68k,
.MIPS => .mips,
.MIPS_RS3_LE => .mipsel,
.PPC => .powerpc,
.SPARC => .sparc,
.@"386" => .x86,
.XCORE => .xcore,
.CSR_KALIMBA => .kalimba,
.LANAI => .lanai,
.AARCH64 => .aarch64,
.PPC64 => .powerpc64,
.RISCV => .riscv64,
.X86_64 => .x86_64,
.BPF => .bpfel,
.SPARCV9 => .sparc64,
.S390 => .s390x,
.SPU_2 => .spu_2,
// FIXME:
// No support for .loongarch32 yet so it is safe to assume we are on .loongarch64.
//
// However, when e_machine is .LOONGARCH, we should check
// ei_class's value to decide the CPU architecture.
// - ELFCLASS32 => .loongarch32
// - ELFCLASS64 => .loongarch64
.LOONGARCH => .loongarch64,
// there's many cases we don't (yet) handle, or will never have a
// zig target cpu arch equivalent (such as null).
else => null,
};
}
};

pub const GRP_COMDAT = 1;
Expand Down
10 changes: 5 additions & 5 deletions src/link/Elf.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1100,7 +1100,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod
error.MalformedObject,
error.MalformedArchive,
error.MismatchedEflags,
error.InvalidCpuArch,
error.InvalidMachineType,
=> continue, // already reported
else => |e| try self.reportParseError(
obj.path,
Expand DownExpand Up@@ -1187,7 +1187,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod

for (system_libs.items) |lib| {
self.parseLibrary(lib, false) catch |err| switch (err) {
error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported
error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported
else => |e| try self.reportParseError(
lib.path,
"unexpected error: parsing library failed with error {s}",
Expand All@@ -1213,7 +1213,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod
error.MalformedObject,
error.MalformedArchive,
error.MismatchedEflags,
error.InvalidCpuArch,
error.InvalidMachineType,
=> continue, // already reported
else => |e| try self.reportParseError(
obj.path,
Expand DownExpand Up@@ -1642,7 +1642,7 @@ fn dumpArgv(self: *Elf, comp: *Compilation) !void {
pub const ParseError = error{
MalformedObject,
MalformedArchive,
InvalidCpuArch,
InvalidMachineType,
MismatchedEflags,
OutOfMemory,
Overflow,
Expand DownExpand Up@@ -1813,7 +1813,7 @@ fn parseLdScript(self: *Elf, lib: SystemLib) ParseError!void {
.needed = scr_obj.needed,
.path = full_path,
}, false) catch |err| switch (err) {
error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported
error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported
else => |e| try self.reportParseError(
full_path,
"unexpected error: parsing library failed with error {s}",
Expand Down
10 changes: 5 additions & 5 deletions src/link/Elf/Object.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,14 +105,14 @@ fn parseCommon(self: *Object, allocator: Allocator, handle: std.fs.File, elf_fil
defer allocator.free(header_buffer);
self.header = @as(*align(1) const elf.Elf64_Ehdr, @ptrCast(header_buffer)).*;

const target = elf_file.base.comp.root_mod.resolved_target.result;
if (target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) {
const em = elf_file.base.comp.root_mod.resolved_target.result.toElfMachine();
if (em != self.header.?.e_machine) {
try elf_file.reportParseError2(
self.index,
"invalid cpu architecture: {s}",
.{@tagName(self.header.?.e_machine.toTargetCpuArch().?)},
"invalid ELF machine type: {s}",
.{@tagName(self.header.?.e_machine)},
);
return error.InvalidCpuArch;
return error.InvalidMachineType;
}
try elf_file.validateEFlags(self.index, self.header.?.e_flags);

Expand Down
10 changes: 5 additions & 5 deletions src/link/Elf/SharedObject.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,14 +56,14 @@ pub fn parse(self: *SharedObject, elf_file: *Elf, handle: std.fs.File) !void {
defer gpa.free(header_buffer);
self.header = @as(*align(1) const elf.Elf64_Ehdr, @ptrCast(header_buffer)).*;

const target = elf_file.base.comp.root_mod.resolved_target.result;
if (target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) {
const em = elf_file.base.comp.root_mod.resolved_target.result.toElfMachine();
if (em != self.header.?.e_machine) {
try elf_file.reportParseError2(
self.index,
"invalid cpu architecture: {s}",
.{@tagName(self.header.?.e_machine.toTargetCpuArch().?)},
"invalid ELF machine type: {s}",
.{@tagName(self.header.?.e_machine)},
);
return error.InvalidCpuArch;
return error.InvalidMachineType;
}

const shoff = std.math.cast(usize, self.header.?.e_shoff) orelse return error.Overflow;
Expand Down
4 changes: 2 additions & 2 deletions src/link/Elf/relocatable.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ pub fn flushStaticLib(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]co
parsePositional(elf_file, obj.path) catch |err| switch (err) {
error.MalformedObject,
error.MalformedArchive,
error.InvalidCpuArch,
error.InvalidMachineType,
error.MismatchedEflags,
=> continue, // already reported
error.UnknownFileType => try elf_file.reportParseError(obj.path, "unknown file type for an object file", .{}),
Expand DownExpand Up@@ -178,7 +178,7 @@ pub fn flushObject(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]const
elf_file.parsePositional(obj.path, obj.must_link) catch |err| switch (err) {
error.MalformedObject,
error.MalformedArchive,
error.InvalidCpuArch,
error.InvalidMachineType,
error.MismatchedEflags,
=> continue, // already reported
else => |e| try elf_file.reportParseError(
Expand Down
2 changes: 1 addition & 1 deletion src/link/MachO.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -921,7 +921,7 @@ fn parseInputFileWorker(self: *MachO, file: File) void {
error.MalformedObject,
error.MalformedDylib,
error.MalformedTbd,
error.InvalidCpuArch,
error.InvalidMachineType,
error.InvalidTarget,
=> {}, // already reported
else => |e| self.reportParseError2(file.getIndex(), "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}) catch {},
Expand Down
4 changes: 2 additions & 2 deletions src/link/MachO/Dylib.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,12 +75,12 @@ fn parseBinary(self: *Dylib, macho_file: *MachO) !void {
macho.CPU_TYPE_X86_64 => .x86_64,
else => |x| {
try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
return error.InvalidCpuArch;
return error.InvalidMachineType;
},
};
if (macho_file.getTarget().cpu.arch != this_cpu_arch) {
try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
return error.InvalidCpuArch;
return error.InvalidMachineType;
}

const lc_buffer = try gpa.alloc(u8, header.sizeofcmds);
Expand Down
8 changes: 4 additions & 4 deletions src/link/MachO/Object.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,12 +91,12 @@ pub fn parse(self: *Object, macho_file: *MachO) !void {
macho.CPU_TYPE_X86_64 => .x86_64,
else => |x| {
try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
return error.InvalidCpuArch;
return error.InvalidMachineType;
},
};
if (cpu_arch != this_cpu_arch) {
try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
return error.InvalidCpuArch;
return error.InvalidMachineType;
}

const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds);
Expand DownExpand Up@@ -1648,12 +1648,12 @@ pub fn parseAr(self: *Object, macho_file: *MachO) !void {
macho.CPU_TYPE_X86_64 => .x86_64,
else => |x| {
try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
return error.InvalidCpuArch;
return error.InvalidMachineType;
},
};
if (macho_file.getTarget().cpu.arch != this_cpu_arch) {
try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
return error.InvalidCpuArch;
return error.InvalidMachineType;
}

const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds);
Expand Down
2 changes: 1 addition & 1 deletion src/link/MachO/relocatable.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,7 @@ fn parseInputFilesAr(macho_file: *MachO) !void {

for (macho_file.objects.items) |index| {
macho_file.getFile(index).?.parseAr(macho_file) catch |err| switch (err) {
error.InvalidCpuArch => {}, // already reported
error.InvalidMachineType => {}, // already reported
else => |e| try macho_file.reportParseError2(index, "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}),
};
}
Expand Down
2 changes: 1 addition & 1 deletion test/link/elf.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2257,7 +2257,7 @@ fn testMismatchedCpuArchitectureError(b: *Build, opts: Options) *Step {
exe.linkLibC();

expectLinkErrors(exe, test_step, .{ .exact = &.{
"invalid cpu architecture: aarch64",
"invalid ELF machine type: AARCH64",
"note: while parsing /?/a.o",
} });

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
`std.{coff,elf}`: Remove the `{MachineType,EM}.toTargetCpuArch()` functions. by alexrp · Pull Request #21177 · ziglang/zig · GitHub
Skip to content
std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.#21177

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

 Merged

andrewrk
merged 2 commits into

from

Aug 25, 2024
 Merged

std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.
#21177
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a69f55a

std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.


alexrp Aug 19, 2024
fb6f5a3

link: Rename InvalidCpuArch error to InvalidMachineType.


alexrp Aug 23, 2024

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


17 changes: 0 additions & 17 deletions
lib/std/coff.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1060,23 +1060,6 @@ pub const MachineType = enum(u16) {
 WCEMIPSV2 = 0x169,

 _,

 pub fn toTargetCpuArch(machine_type: MachineType) ?std.Target.Cpu.Arch {
 return switch (machine_type) {
 .ARM => .arm,
 .POWERPC => .powerpc,
 .RISCV32 => .riscv32,
 .THUMB => .thumb,
 .I386 => .x86,
 .ARM64 => .aarch64,
 .RISCV64 => .riscv64,
 .X64 => .x86_64,
 .LOONGARCH32 => .loongarch32,
 .LOONGARCH64 => .loongarch64,
 // there's cases we don't (yet) handle
 else => null,
 };
 }
};

pub const CoffError = error{
Expand Down

38 changes: 0 additions & 38 deletions
lib/std/elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1646,44 +1646,6 @@ pub const EM = enum(u16) {
 FRV = 0x5441,

 _,

 pub fn toTargetCpuArch(em: EM) ?std.Target.Cpu.Arch {
 return switch (em) {
 .AVR => .avr,
 .MSP430 => .msp430,
 .ARC => .arc,
 .ARM => .arm,
 .HEXAGON => .hexagon,
 .@"68K" => .m68k,
 .MIPS => .mips,
 .MIPS_RS3_LE => .mipsel,
 .PPC => .powerpc,
 .SPARC => .sparc,
 .@"386" => .x86,
 .XCORE => .xcore,
 .CSR_KALIMBA => .kalimba,
 .LANAI => .lanai,
 .AARCH64 => .aarch64,
 .PPC64 => .powerpc64,
 .RISCV => .riscv64,
 .X86_64 => .x86_64,
 .BPF => .bpfel,
 .SPARCV9 => .sparc64,
 .S390 => .s390x,
 .SPU_2 => .spu_2,
 // FIXME:
 // No support for .loongarch32 yet so it is safe to assume we are on .loongarch64.
 //
 // However, when e_machine is .LOONGARCH, we should check
 // ei_class's value to decide the CPU architecture.
 // - ELFCLASS32 => .loongarch32
 // - ELFCLASS64 => .loongarch64
 .LOONGARCH => .loongarch64,
 // there's many cases we don't (yet) handle, or will never have a
 // zig target cpu arch equivalent (such as null).
 else => null,
 };
 }
};

pub const GRP_COMDAT = 1;
Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1100,7 +1100,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod
 error.MalformedObject,
 error.MalformedArchive,
 error.MismatchedEflags,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 => continue, // already reported
 else => |e| try self.reportParseError(
 obj.path,
Expand DownExpand Up@@ -1187,7 +1187,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod

 for (system_libs.items) |lib| {
 self.parseLibrary(lib, false) catch |err| switch (err) {
 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported
 error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported
 else => |e| try self.reportParseError(
 lib.path,
 "unexpected error: parsing library failed with error {s}",
Expand All@@ -1213,7 +1213,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod
 error.MalformedObject,
 error.MalformedArchive,
 error.MismatchedEflags,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 => continue, // already reported
 else => |e| try self.reportParseError(
 obj.path,
Expand DownExpand Up@@ -1642,7 +1642,7 @@ fn dumpArgv(self: *Elf, comp: *Compilation) !void {
pub const ParseError = error{
 MalformedObject,
 MalformedArchive,
InvalidCpuArch,
InvalidMachineType,
 MismatchedEflags,
 OutOfMemory,
 Overflow,
Expand DownExpand Up@@ -1813,7 +1813,7 @@ fn parseLdScript(self: *Elf, lib: SystemLib) ParseError!void {
 .needed = scr_obj.needed,
 .path = full_path,
 }, false) catch |err| switch (err) {
 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported
 error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported
 else => |e| try self.reportParseError(
 full_path,
 "unexpected error: parsing library failed with error {s}",
Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf/Object.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,14 +105,14 @@ fn parseCommon(self: *Object, allocator: Allocator, handle: std.fs.File, elf_fil
 defer allocator.free(header_buffer);
 self.header = @as(*align(1) const elf.Elf64_Ehdr, @ptrCast(header_buffer)).*;

 const target = elf_file.base.comp.root_mod.resolved_target.result;
 if (target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) {
 const em = elf_file.base.comp.root_mod.resolved_target.result.toElfMachine();
 if (em != self.header.?.e_machine) {
 try elf_file.reportParseError2(
 self.index,
 "invalid cpu architecture: {s}",
 .{@tagName(self.header.?.e_machine.toTargetCpuArch().?)},
 "invalid ELF machine type: {s}",
 .{@tagName(self.header.?.e_machine)},
 );
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }
 try elf_file.validateEFlags(self.index, self.header.?.e_flags);

Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf/SharedObject.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,14 +56,14 @@ pub fn parse(self: *SharedObject, elf_file: *Elf, handle: std.fs.File) !void {
 defer gpa.free(header_buffer);
 self.header = @as(*align(1) const elf.Elf64_Ehdr, @ptrCast(header_buffer)).*;

 const target = elf_file.base.comp.root_mod.resolved_target.result;
 if (target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) {
 const em = elf_file.base.comp.root_mod.resolved_target.result.toElfMachine();
 if (em != self.header.?.e_machine) {
 try elf_file.reportParseError2(
 self.index,
 "invalid cpu architecture: {s}",
 .{@tagName(self.header.?.e_machine.toTargetCpuArch().?)},
 "invalid ELF machine type: {s}",
 .{@tagName(self.header.?.e_machine)},
 );
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const shoff = std.math.cast(usize, self.header.?.e_shoff) orelse return error.Overflow;
Expand Down

4 changes: 2 additions & 2 deletions
src/link/Elf/relocatable.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ pub fn flushStaticLib(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]co
 parsePositional(elf_file, obj.path) catch |err| switch (err) {
 error.MalformedObject,
 error.MalformedArchive,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.MismatchedEflags,
 => continue, // already reported
 error.UnknownFileType => try elf_file.reportParseError(obj.path, "unknown file type for an object file", .{}),
Expand DownExpand Up@@ -178,7 +178,7 @@ pub fn flushObject(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]const
 elf_file.parsePositional(obj.path, obj.must_link) catch |err| switch (err) {
 error.MalformedObject,
 error.MalformedArchive,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.MismatchedEflags,
 => continue, // already reported
 else => |e| try elf_file.reportParseError(
Expand Down

2 changes: 1 addition & 1 deletion
src/link/MachO.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -921,7 +921,7 @@ fn parseInputFileWorker(self: *MachO, file: File) void {
 error.MalformedObject,
 error.MalformedDylib,
 error.MalformedTbd,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.InvalidTarget,
 => {}, // already reported
 else => |e| self.reportParseError2(file.getIndex(), "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}) catch {},
Expand Down

4 changes: 2 additions & 2 deletions
src/link/MachO/Dylib.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,12 +75,12 @@ fn parseBinary(self: *Dylib, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (macho_file.getTarget().cpu.arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, header.sizeofcmds);
Expand Down

8 changes: 4 additions & 4 deletions
src/link/MachO/Object.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,12 +91,12 @@ pub fn parse(self: *Object, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (cpu_arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds);
Expand DownExpand Up@@ -1648,12 +1648,12 @@ pub fn parseAr(self: *Object, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (macho_file.getTarget().cpu.arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds);
Expand Down

2 changes: 1 addition & 1 deletion
src/link/MachO/relocatable.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,7 @@ fn parseInputFilesAr(macho_file: *MachO) !void {

 for (macho_file.objects.items) |index| {
 macho_file.getFile(index).?.parseAr(macho_file) catch |err| switch (err) {
 error.InvalidCpuArch => {}, // already reported
 error.InvalidMachineType => {}, // already reported
 else => |e| try macho_file.reportParseError2(index, "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}),
 };
 }
Expand Down

2 changes: 1 addition & 1 deletion
test/link/elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2257,7 +2257,7 @@ fn testMismatchedCpuArchitectureError(b: *Build, opts: Options) *Step {
 exe.linkLibC();

 expectLinkErrors(exe, test_step, .{ .exact = &.{
 "invalid cpu architecture: aarch64",
 "invalid ELF machine type: AARCH64",
 "note: while parsing /?/a.o",
 } });

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
`std.{coff,elf}`: Remove the `{MachineType,EM}.toTargetCpuArch()` functions. by alexrp · Pull Request #21177 · ziglang/zig · GitHub
Skip to content
std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.#21177

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

 Merged

andrewrk
merged 2 commits into

from

Aug 25, 2024
 Merged

std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.
#21177
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a69f55a

std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.


alexrp Aug 19, 2024
fb6f5a3

link: Rename InvalidCpuArch error to InvalidMachineType.


alexrp Aug 23, 2024

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


17 changes: 0 additions & 17 deletions
lib/std/coff.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1060,23 +1060,6 @@ pub const MachineType = enum(u16) {
 WCEMIPSV2 = 0x169,

 _,

 pub fn toTargetCpuArch(machine_type: MachineType) ?std.Target.Cpu.Arch {
 return switch (machine_type) {
 .ARM => .arm,
 .POWERPC => .powerpc,
 .RISCV32 => .riscv32,
 .THUMB => .thumb,
 .I386 => .x86,
 .ARM64 => .aarch64,
 .RISCV64 => .riscv64,
 .X64 => .x86_64,
 .LOONGARCH32 => .loongarch32,
 .LOONGARCH64 => .loongarch64,
 // there's cases we don't (yet) handle
 else => null,
 };
 }
};

pub const CoffError = error{
Expand Down

38 changes: 0 additions & 38 deletions
lib/std/elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1646,44 +1646,6 @@ pub const EM = enum(u16) {
 FRV = 0x5441,

 _,

 pub fn toTargetCpuArch(em: EM) ?std.Target.Cpu.Arch {
 return switch (em) {
 .AVR => .avr,
 .MSP430 => .msp430,
 .ARC => .arc,
 .ARM => .arm,
 .HEXAGON => .hexagon,
 .@"68K" => .m68k,
 .MIPS => .mips,
 .MIPS_RS3_LE => .mipsel,
 .PPC => .powerpc,
 .SPARC => .sparc,
 .@"386" => .x86,
 .XCORE => .xcore,
 .CSR_KALIMBA => .kalimba,
 .LANAI => .lanai,
 .AARCH64 => .aarch64,
 .PPC64 => .powerpc64,
 .RISCV => .riscv64,
 .X86_64 => .x86_64,
 .BPF => .bpfel,
 .SPARCV9 => .sparc64,
 .S390 => .s390x,
 .SPU_2 => .spu_2,
 // FIXME:
 // No support for .loongarch32 yet so it is safe to assume we are on .loongarch64.
 //
 // However, when e_machine is .LOONGARCH, we should check
 // ei_class's value to decide the CPU architecture.
 // - ELFCLASS32 => .loongarch32
 // - ELFCLASS64 => .loongarch64
 .LOONGARCH => .loongarch64,
 // there's many cases we don't (yet) handle, or will never have a
 // zig target cpu arch equivalent (such as null).
 else => null,
 };
 }
};

pub const GRP_COMDAT = 1;
Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1100,7 +1100,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod
 error.MalformedObject,
 error.MalformedArchive,
 error.MismatchedEflags,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 => continue, // already reported
 else => |e| try self.reportParseError(
 obj.path,
Expand DownExpand Up@@ -1187,7 +1187,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod

 for (system_libs.items) |lib| {
 self.parseLibrary(lib, false) catch |err| switch (err) {
 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported
 error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported
 else => |e| try self.reportParseError(
 lib.path,
 "unexpected error: parsing library failed with error {s}",
Expand All@@ -1213,7 +1213,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod
 error.MalformedObject,
 error.MalformedArchive,
 error.MismatchedEflags,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 => continue, // already reported
 else => |e| try self.reportParseError(
 obj.path,
Expand DownExpand Up@@ -1642,7 +1642,7 @@ fn dumpArgv(self: *Elf, comp: *Compilation) !void {
pub const ParseError = error{
 MalformedObject,
 MalformedArchive,
InvalidCpuArch,
InvalidMachineType,
 MismatchedEflags,
 OutOfMemory,
 Overflow,
Expand DownExpand Up@@ -1813,7 +1813,7 @@ fn parseLdScript(self: *Elf, lib: SystemLib) ParseError!void {
 .needed = scr_obj.needed,
 .path = full_path,
 }, false) catch |err| switch (err) {
 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported
 error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported
 else => |e| try self.reportParseError(
 full_path,
 "unexpected error: parsing library failed with error {s}",
Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf/Object.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,14 +105,14 @@ fn parseCommon(self: *Object, allocator: Allocator, handle: std.fs.File, elf_fil
 defer allocator.free(header_buffer);
 self.header = @as(*align(1) const elf.Elf64_Ehdr, @ptrCast(header_buffer)).*;

 const target = elf_file.base.comp.root_mod.resolved_target.result;
 if (target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) {
 const em = elf_file.base.comp.root_mod.resolved_target.result.toElfMachine();
 if (em != self.header.?.e_machine) {
 try elf_file.reportParseError2(
 self.index,
 "invalid cpu architecture: {s}",
 .{@tagName(self.header.?.e_machine.toTargetCpuArch().?)},
 "invalid ELF machine type: {s}",
 .{@tagName(self.header.?.e_machine)},
 );
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }
 try elf_file.validateEFlags(self.index, self.header.?.e_flags);

Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf/SharedObject.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,14 +56,14 @@ pub fn parse(self: *SharedObject, elf_file: *Elf, handle: std.fs.File) !void {
 defer gpa.free(header_buffer);
 self.header = @as(*align(1) const elf.Elf64_Ehdr, @ptrCast(header_buffer)).*;

 const target = elf_file.base.comp.root_mod.resolved_target.result;
 if (target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) {
 const em = elf_file.base.comp.root_mod.resolved_target.result.toElfMachine();
 if (em != self.header.?.e_machine) {
 try elf_file.reportParseError2(
 self.index,
 "invalid cpu architecture: {s}",
 .{@tagName(self.header.?.e_machine.toTargetCpuArch().?)},
 "invalid ELF machine type: {s}",
 .{@tagName(self.header.?.e_machine)},
 );
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const shoff = std.math.cast(usize, self.header.?.e_shoff) orelse return error.Overflow;
Expand Down

4 changes: 2 additions & 2 deletions
src/link/Elf/relocatable.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ pub fn flushStaticLib(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]co
 parsePositional(elf_file, obj.path) catch |err| switch (err) {
 error.MalformedObject,
 error.MalformedArchive,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.MismatchedEflags,
 => continue, // already reported
 error.UnknownFileType => try elf_file.reportParseError(obj.path, "unknown file type for an object file", .{}),
Expand DownExpand Up@@ -178,7 +178,7 @@ pub fn flushObject(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]const
 elf_file.parsePositional(obj.path, obj.must_link) catch |err| switch (err) {
 error.MalformedObject,
 error.MalformedArchive,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.MismatchedEflags,
 => continue, // already reported
 else => |e| try elf_file.reportParseError(
Expand Down

2 changes: 1 addition & 1 deletion
src/link/MachO.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -921,7 +921,7 @@ fn parseInputFileWorker(self: *MachO, file: File) void {
 error.MalformedObject,
 error.MalformedDylib,
 error.MalformedTbd,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.InvalidTarget,
 => {}, // already reported
 else => |e| self.reportParseError2(file.getIndex(), "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}) catch {},
Expand Down

4 changes: 2 additions & 2 deletions
src/link/MachO/Dylib.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,12 +75,12 @@ fn parseBinary(self: *Dylib, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (macho_file.getTarget().cpu.arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, header.sizeofcmds);
Expand Down

8 changes: 4 additions & 4 deletions
src/link/MachO/Object.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,12 +91,12 @@ pub fn parse(self: *Object, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (cpu_arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds);
Expand DownExpand Up@@ -1648,12 +1648,12 @@ pub fn parseAr(self: *Object, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (macho_file.getTarget().cpu.arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds);
Expand Down

2 changes: 1 addition & 1 deletion
src/link/MachO/relocatable.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,7 @@ fn parseInputFilesAr(macho_file: *MachO) !void {

 for (macho_file.objects.items) |index| {
 macho_file.getFile(index).?.parseAr(macho_file) catch |err| switch (err) {
 error.InvalidCpuArch => {}, // already reported
 error.InvalidMachineType => {}, // already reported
 else => |e| try macho_file.reportParseError2(index, "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}),
 };
 }
Expand Down

2 changes: 1 addition & 1 deletion
test/link/elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2257,7 +2257,7 @@ fn testMismatchedCpuArchitectureError(b: *Build, opts: Options) *Step {
 exe.linkLibC();

 expectLinkErrors(exe, test_step, .{ .exact = &.{
 "invalid cpu architecture: aarch64",
 "invalid ELF machine type: AARCH64",
 "note: while parsing /?/a.o",
 } });

Expand Down

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

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

 Merged

andrewrk
merged 2 commits into

from

Aug 25, 2024
 Merged

std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.
#21177
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a69f55a

std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.


alexrp Aug 19, 2024
fb6f5a3

link: Rename InvalidCpuArch error to InvalidMachineType.


alexrp Aug 23, 2024

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


17 changes: 0 additions & 17 deletions
lib/std/coff.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1060,23 +1060,6 @@ pub const MachineType = enum(u16) {
 WCEMIPSV2 = 0x169,

 _,

 pub fn toTargetCpuArch(machine_type: MachineType) ?std.Target.Cpu.Arch {
 return switch (machine_type) {
 .ARM => .arm,
 .POWERPC => .powerpc,
 .RISCV32 => .riscv32,
 .THUMB => .thumb,
 .I386 => .x86,
 .ARM64 => .aarch64,
 .RISCV64 => .riscv64,
 .X64 => .x86_64,
 .LOONGARCH32 => .loongarch32,
 .LOONGARCH64 => .loongarch64,
 // there's cases we don't (yet) handle
 else => null,
 };
 }
};

pub const CoffError = error{
Expand Down

38 changes: 0 additions & 38 deletions
lib/std/elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1646,44 +1646,6 @@ pub const EM = enum(u16) {
 FRV = 0x5441,

 _,

 pub fn toTargetCpuArch(em: EM) ?std.Target.Cpu.Arch {
 return switch (em) {
 .AVR => .avr,
 .MSP430 => .msp430,
 .ARC => .arc,
 .ARM => .arm,
 .HEXAGON => .hexagon,
 .@"68K" => .m68k,
 .MIPS => .mips,
 .MIPS_RS3_LE => .mipsel,
 .PPC => .powerpc,
 .SPARC => .sparc,
 .@"386" => .x86,
 .XCORE => .xcore,
 .CSR_KALIMBA => .kalimba,
 .LANAI => .lanai,
 .AARCH64 => .aarch64,
 .PPC64 => .powerpc64,
 .RISCV => .riscv64,
 .X86_64 => .x86_64,
 .BPF => .bpfel,
 .SPARCV9 => .sparc64,
 .S390 => .s390x,
 .SPU_2 => .spu_2,
 // FIXME:
 // No support for .loongarch32 yet so it is safe to assume we are on .loongarch64.
 //
 // However, when e_machine is .LOONGARCH, we should check
 // ei_class's value to decide the CPU architecture.
 // - ELFCLASS32 => .loongarch32
 // - ELFCLASS64 => .loongarch64
 .LOONGARCH => .loongarch64,
 // there's many cases we don't (yet) handle, or will never have a
 // zig target cpu arch equivalent (such as null).
 else => null,
 };
 }
};

pub const GRP_COMDAT = 1;
Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1100,7 +1100,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod
 error.MalformedObject,
 error.MalformedArchive,
 error.MismatchedEflags,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 => continue, // already reported
 else => |e| try self.reportParseError(
 obj.path,
Expand DownExpand Up@@ -1187,7 +1187,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod

 for (system_libs.items) |lib| {
 self.parseLibrary(lib, false) catch |err| switch (err) {
 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported
 error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported
 else => |e| try self.reportParseError(
 lib.path,
 "unexpected error: parsing library failed with error {s}",
Expand All@@ -1213,7 +1213,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod
 error.MalformedObject,
 error.MalformedArchive,
 error.MismatchedEflags,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 => continue, // already reported
 else => |e| try self.reportParseError(
 obj.path,
Expand DownExpand Up@@ -1642,7 +1642,7 @@ fn dumpArgv(self: *Elf, comp: *Compilation) !void {
pub const ParseError = error{
 MalformedObject,
 MalformedArchive,
InvalidCpuArch,
InvalidMachineType,
 MismatchedEflags,
 OutOfMemory,
 Overflow,
Expand DownExpand Up@@ -1813,7 +1813,7 @@ fn parseLdScript(self: *Elf, lib: SystemLib) ParseError!void {
 .needed = scr_obj.needed,
 .path = full_path,
 }, false) catch |err| switch (err) {
 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported
 error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported
 else => |e| try self.reportParseError(
 full_path,
 "unexpected error: parsing library failed with error {s}",
Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf/Object.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,14 +105,14 @@ fn parseCommon(self: *Object, allocator: Allocator, handle: std.fs.File, elf_fil
 defer allocator.free(header_buffer);
 self.header = @as(*align(1) const elf.Elf64_Ehdr, @ptrCast(header_buffer)).*;

 const target = elf_file.base.comp.root_mod.resolved_target.result;
 if (target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) {
 const em = elf_file.base.comp.root_mod.resolved_target.result.toElfMachine();
 if (em != self.header.?.e_machine) {
 try elf_file.reportParseError2(
 self.index,
 "invalid cpu architecture: {s}",
 .{@tagName(self.header.?.e_machine.toTargetCpuArch().?)},
 "invalid ELF machine type: {s}",
 .{@tagName(self.header.?.e_machine)},
 );
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }
 try elf_file.validateEFlags(self.index, self.header.?.e_flags);

Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf/SharedObject.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,14 +56,14 @@ pub fn parse(self: *SharedObject, elf_file: *Elf, handle: std.fs.File) !void {
 defer gpa.free(header_buffer);
 self.header = @as(*align(1) const elf.Elf64_Ehdr, @ptrCast(header_buffer)).*;

 const target = elf_file.base.comp.root_mod.resolved_target.result;
 if (target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) {
 const em = elf_file.base.comp.root_mod.resolved_target.result.toElfMachine();
 if (em != self.header.?.e_machine) {
 try elf_file.reportParseError2(
 self.index,
 "invalid cpu architecture: {s}",
 .{@tagName(self.header.?.e_machine.toTargetCpuArch().?)},
 "invalid ELF machine type: {s}",
 .{@tagName(self.header.?.e_machine)},
 );
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const shoff = std.math.cast(usize, self.header.?.e_shoff) orelse return error.Overflow;
Expand Down

4 changes: 2 additions & 2 deletions
src/link/Elf/relocatable.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ pub fn flushStaticLib(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]co
 parsePositional(elf_file, obj.path) catch |err| switch (err) {
 error.MalformedObject,
 error.MalformedArchive,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.MismatchedEflags,
 => continue, // already reported
 error.UnknownFileType => try elf_file.reportParseError(obj.path, "unknown file type for an object file", .{}),
Expand DownExpand Up@@ -178,7 +178,7 @@ pub fn flushObject(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]const
 elf_file.parsePositional(obj.path, obj.must_link) catch |err| switch (err) {
 error.MalformedObject,
 error.MalformedArchive,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.MismatchedEflags,
 => continue, // already reported
 else => |e| try elf_file.reportParseError(
Expand Down

2 changes: 1 addition & 1 deletion
src/link/MachO.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -921,7 +921,7 @@ fn parseInputFileWorker(self: *MachO, file: File) void {
 error.MalformedObject,
 error.MalformedDylib,
 error.MalformedTbd,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.InvalidTarget,
 => {}, // already reported
 else => |e| self.reportParseError2(file.getIndex(), "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}) catch {},
Expand Down

4 changes: 2 additions & 2 deletions
src/link/MachO/Dylib.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,12 +75,12 @@ fn parseBinary(self: *Dylib, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (macho_file.getTarget().cpu.arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, header.sizeofcmds);
Expand Down

8 changes: 4 additions & 4 deletions
src/link/MachO/Object.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,12 +91,12 @@ pub fn parse(self: *Object, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (cpu_arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds);
Expand DownExpand Up@@ -1648,12 +1648,12 @@ pub fn parseAr(self: *Object, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (macho_file.getTarget().cpu.arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds);
Expand Down

2 changes: 1 addition & 1 deletion
src/link/MachO/relocatable.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,7 @@ fn parseInputFilesAr(macho_file: *MachO) !void {

 for (macho_file.objects.items) |index| {
 macho_file.getFile(index).?.parseAr(macho_file) catch |err| switch (err) {
 error.InvalidCpuArch => {}, // already reported
 error.InvalidMachineType => {}, // already reported
 else => |e| try macho_file.reportParseError2(index, "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}),
 };
 }
Expand Down

2 changes: 1 addition & 1 deletion
test/link/elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2257,7 +2257,7 @@ fn testMismatchedCpuArchitectureError(b: *Build, opts: Options) *Step {
 exe.linkLibC();

 expectLinkErrors(exe, test_step, .{ .exact = &.{
 "invalid cpu architecture: aarch64",
 "invalid ELF machine type: AARCH64",
 "note: while parsing /?/a.o",
 } });

Expand Down

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

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

 Merged

andrewrk
merged 2 commits into

from

Aug 25, 2024
 Merged

std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.
#21177
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a69f55a

std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.


alexrp Aug 19, 2024
fb6f5a3

link: Rename InvalidCpuArch error to InvalidMachineType.


alexrp Aug 23, 2024

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


17 changes: 0 additions & 17 deletions
lib/std/coff.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1060,23 +1060,6 @@ pub const MachineType = enum(u16) {
 WCEMIPSV2 = 0x169,

 _,

 pub fn toTargetCpuArch(machine_type: MachineType) ?std.Target.Cpu.Arch {
 return switch (machine_type) {
 .ARM => .arm,
 .POWERPC => .powerpc,
 .RISCV32 => .riscv32,
 .THUMB => .thumb,
 .I386 => .x86,
 .ARM64 => .aarch64,
 .RISCV64 => .riscv64,
 .X64 => .x86_64,
 .LOONGARCH32 => .loongarch32,
 .LOONGARCH64 => .loongarch64,
 // there's cases we don't (yet) handle
 else => null,
 };
 }
};

pub const CoffError = error{
Expand Down

38 changes: 0 additions & 38 deletions
lib/std/elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1646,44 +1646,6 @@ pub const EM = enum(u16) {
 FRV = 0x5441,

 _,

 pub fn toTargetCpuArch(em: EM) ?std.Target.Cpu.Arch {
 return switch (em) {
 .AVR => .avr,
 .MSP430 => .msp430,
 .ARC => .arc,
 .ARM => .arm,
 .HEXAGON => .hexagon,
 .@"68K" => .m68k,
 .MIPS => .mips,
 .MIPS_RS3_LE => .mipsel,
 .PPC => .powerpc,
 .SPARC => .sparc,
 .@"386" => .x86,
 .XCORE => .xcore,
 .CSR_KALIMBA => .kalimba,
 .LANAI => .lanai,
 .AARCH64 => .aarch64,
 .PPC64 => .powerpc64,
 .RISCV => .riscv64,
 .X86_64 => .x86_64,
 .BPF => .bpfel,
 .SPARCV9 => .sparc64,
 .S390 => .s390x,
 .SPU_2 => .spu_2,
 // FIXME:
 // No support for .loongarch32 yet so it is safe to assume we are on .loongarch64.
 //
 // However, when e_machine is .LOONGARCH, we should check
 // ei_class's value to decide the CPU architecture.
 // - ELFCLASS32 => .loongarch32
 // - ELFCLASS64 => .loongarch64
 .LOONGARCH => .loongarch64,
 // there's many cases we don't (yet) handle, or will never have a
 // zig target cpu arch equivalent (such as null).
 else => null,
 };
 }
};

pub const GRP_COMDAT = 1;
Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1100,7 +1100,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod
 error.MalformedObject,
 error.MalformedArchive,
 error.MismatchedEflags,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 => continue, // already reported
 else => |e| try self.reportParseError(
 obj.path,
Expand DownExpand Up@@ -1187,7 +1187,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod

 for (system_libs.items) |lib| {
 self.parseLibrary(lib, false) catch |err| switch (err) {
 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported
 error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported
 else => |e| try self.reportParseError(
 lib.path,
 "unexpected error: parsing library failed with error {s}",
Expand All@@ -1213,7 +1213,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod
 error.MalformedObject,
 error.MalformedArchive,
 error.MismatchedEflags,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 => continue, // already reported
 else => |e| try self.reportParseError(
 obj.path,
Expand DownExpand Up@@ -1642,7 +1642,7 @@ fn dumpArgv(self: *Elf, comp: *Compilation) !void {
pub const ParseError = error{
 MalformedObject,
 MalformedArchive,
InvalidCpuArch,
InvalidMachineType,
 MismatchedEflags,
 OutOfMemory,
 Overflow,
Expand DownExpand Up@@ -1813,7 +1813,7 @@ fn parseLdScript(self: *Elf, lib: SystemLib) ParseError!void {
 .needed = scr_obj.needed,
 .path = full_path,
 }, false) catch |err| switch (err) {
 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported
 error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported
 else => |e| try self.reportParseError(
 full_path,
 "unexpected error: parsing library failed with error {s}",
Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf/Object.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,14 +105,14 @@ fn parseCommon(self: *Object, allocator: Allocator, handle: std.fs.File, elf_fil
 defer allocator.free(header_buffer);
 self.header = @as(*align(1) const elf.Elf64_Ehdr, @ptrCast(header_buffer)).*;

 const target = elf_file.base.comp.root_mod.resolved_target.result;
 if (target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) {
 const em = elf_file.base.comp.root_mod.resolved_target.result.toElfMachine();
 if (em != self.header.?.e_machine) {
 try elf_file.reportParseError2(
 self.index,
 "invalid cpu architecture: {s}",
 .{@tagName(self.header.?.e_machine.toTargetCpuArch().?)},
 "invalid ELF machine type: {s}",
 .{@tagName(self.header.?.e_machine)},
 );
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }
 try elf_file.validateEFlags(self.index, self.header.?.e_flags);

Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf/SharedObject.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,14 +56,14 @@ pub fn parse(self: *SharedObject, elf_file: *Elf, handle: std.fs.File) !void {
 defer gpa.free(header_buffer);
 self.header = @as(*align(1) const elf.Elf64_Ehdr, @ptrCast(header_buffer)).*;

 const target = elf_file.base.comp.root_mod.resolved_target.result;
 if (target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) {
 const em = elf_file.base.comp.root_mod.resolved_target.result.toElfMachine();
 if (em != self.header.?.e_machine) {
 try elf_file.reportParseError2(
 self.index,
 "invalid cpu architecture: {s}",
 .{@tagName(self.header.?.e_machine.toTargetCpuArch().?)},
 "invalid ELF machine type: {s}",
 .{@tagName(self.header.?.e_machine)},
 );
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const shoff = std.math.cast(usize, self.header.?.e_shoff) orelse return error.Overflow;
Expand Down

4 changes: 2 additions & 2 deletions
src/link/Elf/relocatable.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ pub fn flushStaticLib(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]co
 parsePositional(elf_file, obj.path) catch |err| switch (err) {
 error.MalformedObject,
 error.MalformedArchive,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.MismatchedEflags,
 => continue, // already reported
 error.UnknownFileType => try elf_file.reportParseError(obj.path, "unknown file type for an object file", .{}),
Expand DownExpand Up@@ -178,7 +178,7 @@ pub fn flushObject(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]const
 elf_file.parsePositional(obj.path, obj.must_link) catch |err| switch (err) {
 error.MalformedObject,
 error.MalformedArchive,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.MismatchedEflags,
 => continue, // already reported
 else => |e| try elf_file.reportParseError(
Expand Down

2 changes: 1 addition & 1 deletion
src/link/MachO.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -921,7 +921,7 @@ fn parseInputFileWorker(self: *MachO, file: File) void {
 error.MalformedObject,
 error.MalformedDylib,
 error.MalformedTbd,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.InvalidTarget,
 => {}, // already reported
 else => |e| self.reportParseError2(file.getIndex(), "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}) catch {},
Expand Down

4 changes: 2 additions & 2 deletions
src/link/MachO/Dylib.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,12 +75,12 @@ fn parseBinary(self: *Dylib, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (macho_file.getTarget().cpu.arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, header.sizeofcmds);
Expand Down

8 changes: 4 additions & 4 deletions
src/link/MachO/Object.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,12 +91,12 @@ pub fn parse(self: *Object, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (cpu_arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds);
Expand DownExpand Up@@ -1648,12 +1648,12 @@ pub fn parseAr(self: *Object, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (macho_file.getTarget().cpu.arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds);
Expand Down

2 changes: 1 addition & 1 deletion
src/link/MachO/relocatable.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,7 @@ fn parseInputFilesAr(macho_file: *MachO) !void {

 for (macho_file.objects.items) |index| {
 macho_file.getFile(index).?.parseAr(macho_file) catch |err| switch (err) {
 error.InvalidCpuArch => {}, // already reported
 error.InvalidMachineType => {}, // already reported
 else => |e| try macho_file.reportParseError2(index, "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}),
 };
 }
Expand Down

2 changes: 1 addition & 1 deletion
test/link/elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2257,7 +2257,7 @@ fn testMismatchedCpuArchitectureError(b: *Build, opts: Options) *Step {
 exe.linkLibC();

 expectLinkErrors(exe, test_step, .{ .exact = &.{
 "invalid cpu architecture: aarch64",
 "invalid ELF machine type: AARCH64",
 "note: while parsing /?/a.o",
 } });

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
`std.{coff,elf}`: Remove the `{MachineType,EM}.toTargetCpuArch()` functions. by alexrp · Pull Request #21177 · ziglang/zig · GitHub
Skip to content
std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.#21177

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

 Merged

andrewrk
merged 2 commits into

from

Aug 25, 2024
 Merged

std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.
#21177
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a69f55a

std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.


alexrp Aug 19, 2024
fb6f5a3

link: Rename InvalidCpuArch error to InvalidMachineType.


alexrp Aug 23, 2024

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


17 changes: 0 additions & 17 deletions
lib/std/coff.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1060,23 +1060,6 @@ pub const MachineType = enum(u16) {
 WCEMIPSV2 = 0x169,

 _,

 pub fn toTargetCpuArch(machine_type: MachineType) ?std.Target.Cpu.Arch {
 return switch (machine_type) {
 .ARM => .arm,
 .POWERPC => .powerpc,
 .RISCV32 => .riscv32,
 .THUMB => .thumb,
 .I386 => .x86,
 .ARM64 => .aarch64,
 .RISCV64 => .riscv64,
 .X64 => .x86_64,
 .LOONGARCH32 => .loongarch32,
 .LOONGARCH64 => .loongarch64,
 // there's cases we don't (yet) handle
 else => null,
 };
 }
};

pub const CoffError = error{
Expand Down

38 changes: 0 additions & 38 deletions
lib/std/elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1646,44 +1646,6 @@ pub const EM = enum(u16) {
 FRV = 0x5441,

 _,

 pub fn toTargetCpuArch(em: EM) ?std.Target.Cpu.Arch {
 return switch (em) {
 .AVR => .avr,
 .MSP430 => .msp430,
 .ARC => .arc,
 .ARM => .arm,
 .HEXAGON => .hexagon,
 .@"68K" => .m68k,
 .MIPS => .mips,
 .MIPS_RS3_LE => .mipsel,
 .PPC => .powerpc,
 .SPARC => .sparc,
 .@"386" => .x86,
 .XCORE => .xcore,
 .CSR_KALIMBA => .kalimba,
 .LANAI => .lanai,
 .AARCH64 => .aarch64,
 .PPC64 => .powerpc64,
 .RISCV => .riscv64,
 .X86_64 => .x86_64,
 .BPF => .bpfel,
 .SPARCV9 => .sparc64,
 .S390 => .s390x,
 .SPU_2 => .spu_2,
 // FIXME:
 // No support for .loongarch32 yet so it is safe to assume we are on .loongarch64.
 //
 // However, when e_machine is .LOONGARCH, we should check
 // ei_class's value to decide the CPU architecture.
 // - ELFCLASS32 => .loongarch32
 // - ELFCLASS64 => .loongarch64
 .LOONGARCH => .loongarch64,
 // there's many cases we don't (yet) handle, or will never have a
 // zig target cpu arch equivalent (such as null).
 else => null,
 };
 }
};

pub const GRP_COMDAT = 1;
Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1100,7 +1100,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod
 error.MalformedObject,
 error.MalformedArchive,
 error.MismatchedEflags,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 => continue, // already reported
 else => |e| try self.reportParseError(
 obj.path,
Expand DownExpand Up@@ -1187,7 +1187,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod

 for (system_libs.items) |lib| {
 self.parseLibrary(lib, false) catch |err| switch (err) {
 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported
 error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported
 else => |e| try self.reportParseError(
 lib.path,
 "unexpected error: parsing library failed with error {s}",
Expand All@@ -1213,7 +1213,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod
 error.MalformedObject,
 error.MalformedArchive,
 error.MismatchedEflags,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 => continue, // already reported
 else => |e| try self.reportParseError(
 obj.path,
Expand DownExpand Up@@ -1642,7 +1642,7 @@ fn dumpArgv(self: *Elf, comp: *Compilation) !void {
pub const ParseError = error{
 MalformedObject,
 MalformedArchive,
InvalidCpuArch,
InvalidMachineType,
 MismatchedEflags,
 OutOfMemory,
 Overflow,
Expand DownExpand Up@@ -1813,7 +1813,7 @@ fn parseLdScript(self: *Elf, lib: SystemLib) ParseError!void {
 .needed = scr_obj.needed,
 .path = full_path,
 }, false) catch |err| switch (err) {
 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported
 error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported
 else => |e| try self.reportParseError(
 full_path,
 "unexpected error: parsing library failed with error {s}",
Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf/Object.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,14 +105,14 @@ fn parseCommon(self: *Object, allocator: Allocator, handle: std.fs.File, elf_fil
 defer allocator.free(header_buffer);
 self.header = @as(*align(1) const elf.Elf64_Ehdr, @ptrCast(header_buffer)).*;

 const target = elf_file.base.comp.root_mod.resolved_target.result;
 if (target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) {
 const em = elf_file.base.comp.root_mod.resolved_target.result.toElfMachine();
 if (em != self.header.?.e_machine) {
 try elf_file.reportParseError2(
 self.index,
 "invalid cpu architecture: {s}",
 .{@tagName(self.header.?.e_machine.toTargetCpuArch().?)},
 "invalid ELF machine type: {s}",
 .{@tagName(self.header.?.e_machine)},
 );
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }
 try elf_file.validateEFlags(self.index, self.header.?.e_flags);

Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf/SharedObject.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,14 +56,14 @@ pub fn parse(self: *SharedObject, elf_file: *Elf, handle: std.fs.File) !void {
 defer gpa.free(header_buffer);
 self.header = @as(*align(1) const elf.Elf64_Ehdr, @ptrCast(header_buffer)).*;

 const target = elf_file.base.comp.root_mod.resolved_target.result;
 if (target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) {
 const em = elf_file.base.comp.root_mod.resolved_target.result.toElfMachine();
 if (em != self.header.?.e_machine) {
 try elf_file.reportParseError2(
 self.index,
 "invalid cpu architecture: {s}",
 .{@tagName(self.header.?.e_machine.toTargetCpuArch().?)},
 "invalid ELF machine type: {s}",
 .{@tagName(self.header.?.e_machine)},
 );
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const shoff = std.math.cast(usize, self.header.?.e_shoff) orelse return error.Overflow;
Expand Down

4 changes: 2 additions & 2 deletions
src/link/Elf/relocatable.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ pub fn flushStaticLib(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]co
 parsePositional(elf_file, obj.path) catch |err| switch (err) {
 error.MalformedObject,
 error.MalformedArchive,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.MismatchedEflags,
 => continue, // already reported
 error.UnknownFileType => try elf_file.reportParseError(obj.path, "unknown file type for an object file", .{}),
Expand DownExpand Up@@ -178,7 +178,7 @@ pub fn flushObject(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]const
 elf_file.parsePositional(obj.path, obj.must_link) catch |err| switch (err) {
 error.MalformedObject,
 error.MalformedArchive,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.MismatchedEflags,
 => continue, // already reported
 else => |e| try elf_file.reportParseError(
Expand Down

2 changes: 1 addition & 1 deletion
src/link/MachO.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -921,7 +921,7 @@ fn parseInputFileWorker(self: *MachO, file: File) void {
 error.MalformedObject,
 error.MalformedDylib,
 error.MalformedTbd,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.InvalidTarget,
 => {}, // already reported
 else => |e| self.reportParseError2(file.getIndex(), "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}) catch {},
Expand Down

4 changes: 2 additions & 2 deletions
src/link/MachO/Dylib.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,12 +75,12 @@ fn parseBinary(self: *Dylib, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (macho_file.getTarget().cpu.arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, header.sizeofcmds);
Expand Down

8 changes: 4 additions & 4 deletions
src/link/MachO/Object.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,12 +91,12 @@ pub fn parse(self: *Object, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (cpu_arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds);
Expand DownExpand Up@@ -1648,12 +1648,12 @@ pub fn parseAr(self: *Object, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (macho_file.getTarget().cpu.arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds);
Expand Down

2 changes: 1 addition & 1 deletion
src/link/MachO/relocatable.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,7 @@ fn parseInputFilesAr(macho_file: *MachO) !void {

 for (macho_file.objects.items) |index| {
 macho_file.getFile(index).?.parseAr(macho_file) catch |err| switch (err) {
 error.InvalidCpuArch => {}, // already reported
 error.InvalidMachineType => {}, // already reported
 else => |e| try macho_file.reportParseError2(index, "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}),
 };
 }
Expand Down

2 changes: 1 addition & 1 deletion
test/link/elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2257,7 +2257,7 @@ fn testMismatchedCpuArchitectureError(b: *Build, opts: Options) *Step {
 exe.linkLibC();

 expectLinkErrors(exe, test_step, .{ .exact = &.{
 "invalid cpu architecture: aarch64",
 "invalid ELF machine type: AARCH64",
 "note: while parsing /?/a.o",
 } });

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
`std.{coff,elf}`: Remove the `{MachineType,EM}.toTargetCpuArch()` functions. by alexrp · Pull Request #21177 · ziglang/zig · GitHub
Skip to content
std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.#21177

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

 Merged

andrewrk
merged 2 commits into

from

Aug 25, 2024
 Merged

std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.
#21177
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a69f55a

std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.


alexrp Aug 19, 2024
fb6f5a3

link: Rename InvalidCpuArch error to InvalidMachineType.


alexrp Aug 23, 2024

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


17 changes: 0 additions & 17 deletions
lib/std/coff.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1060,23 +1060,6 @@ pub const MachineType = enum(u16) {
 WCEMIPSV2 = 0x169,

 _,

 pub fn toTargetCpuArch(machine_type: MachineType) ?std.Target.Cpu.Arch {
 return switch (machine_type) {
 .ARM => .arm,
 .POWERPC => .powerpc,
 .RISCV32 => .riscv32,
 .THUMB => .thumb,
 .I386 => .x86,
 .ARM64 => .aarch64,
 .RISCV64 => .riscv64,
 .X64 => .x86_64,
 .LOONGARCH32 => .loongarch32,
 .LOONGARCH64 => .loongarch64,
 // there's cases we don't (yet) handle
 else => null,
 };
 }
};

pub const CoffError = error{
Expand Down

38 changes: 0 additions & 38 deletions
lib/std/elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1646,44 +1646,6 @@ pub const EM = enum(u16) {
 FRV = 0x5441,

 _,

 pub fn toTargetCpuArch(em: EM) ?std.Target.Cpu.Arch {
 return switch (em) {
 .AVR => .avr,
 .MSP430 => .msp430,
 .ARC => .arc,
 .ARM => .arm,
 .HEXAGON => .hexagon,
 .@"68K" => .m68k,
 .MIPS => .mips,
 .MIPS_RS3_LE => .mipsel,
 .PPC => .powerpc,
 .SPARC => .sparc,
 .@"386" => .x86,
 .XCORE => .xcore,
 .CSR_KALIMBA => .kalimba,
 .LANAI => .lanai,
 .AARCH64 => .aarch64,
 .PPC64 => .powerpc64,
 .RISCV => .riscv64,
 .X86_64 => .x86_64,
 .BPF => .bpfel,
 .SPARCV9 => .sparc64,
 .S390 => .s390x,
 .SPU_2 => .spu_2,
 // FIXME:
 // No support for .loongarch32 yet so it is safe to assume we are on .loongarch64.
 //
 // However, when e_machine is .LOONGARCH, we should check
 // ei_class's value to decide the CPU architecture.
 // - ELFCLASS32 => .loongarch32
 // - ELFCLASS64 => .loongarch64
 .LOONGARCH => .loongarch64,
 // there's many cases we don't (yet) handle, or will never have a
 // zig target cpu arch equivalent (such as null).
 else => null,
 };
 }
};

pub const GRP_COMDAT = 1;
Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1100,7 +1100,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod
 error.MalformedObject,
 error.MalformedArchive,
 error.MismatchedEflags,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 => continue, // already reported
 else => |e| try self.reportParseError(
 obj.path,
Expand DownExpand Up@@ -1187,7 +1187,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod

 for (system_libs.items) |lib| {
 self.parseLibrary(lib, false) catch |err| switch (err) {
 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported
 error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported
 else => |e| try self.reportParseError(
 lib.path,
 "unexpected error: parsing library failed with error {s}",
Expand All@@ -1213,7 +1213,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod
 error.MalformedObject,
 error.MalformedArchive,
 error.MismatchedEflags,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 => continue, // already reported
 else => |e| try self.reportParseError(
 obj.path,
Expand DownExpand Up@@ -1642,7 +1642,7 @@ fn dumpArgv(self: *Elf, comp: *Compilation) !void {
pub const ParseError = error{
 MalformedObject,
 MalformedArchive,
InvalidCpuArch,
InvalidMachineType,
 MismatchedEflags,
 OutOfMemory,
 Overflow,
Expand DownExpand Up@@ -1813,7 +1813,7 @@ fn parseLdScript(self: *Elf, lib: SystemLib) ParseError!void {
 .needed = scr_obj.needed,
 .path = full_path,
 }, false) catch |err| switch (err) {
 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported
 error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported
 else => |e| try self.reportParseError(
 full_path,
 "unexpected error: parsing library failed with error {s}",
Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf/Object.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,14 +105,14 @@ fn parseCommon(self: *Object, allocator: Allocator, handle: std.fs.File, elf_fil
 defer allocator.free(header_buffer);
 self.header = @as(*align(1) const elf.Elf64_Ehdr, @ptrCast(header_buffer)).*;

 const target = elf_file.base.comp.root_mod.resolved_target.result;
 if (target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) {
 const em = elf_file.base.comp.root_mod.resolved_target.result.toElfMachine();
 if (em != self.header.?.e_machine) {
 try elf_file.reportParseError2(
 self.index,
 "invalid cpu architecture: {s}",
 .{@tagName(self.header.?.e_machine.toTargetCpuArch().?)},
 "invalid ELF machine type: {s}",
 .{@tagName(self.header.?.e_machine)},
 );
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }
 try elf_file.validateEFlags(self.index, self.header.?.e_flags);

Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf/SharedObject.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,14 +56,14 @@ pub fn parse(self: *SharedObject, elf_file: *Elf, handle: std.fs.File) !void {
 defer gpa.free(header_buffer);
 self.header = @as(*align(1) const elf.Elf64_Ehdr, @ptrCast(header_buffer)).*;

 const target = elf_file.base.comp.root_mod.resolved_target.result;
 if (target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) {
 const em = elf_file.base.comp.root_mod.resolved_target.result.toElfMachine();
 if (em != self.header.?.e_machine) {
 try elf_file.reportParseError2(
 self.index,
 "invalid cpu architecture: {s}",
 .{@tagName(self.header.?.e_machine.toTargetCpuArch().?)},
 "invalid ELF machine type: {s}",
 .{@tagName(self.header.?.e_machine)},
 );
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const shoff = std.math.cast(usize, self.header.?.e_shoff) orelse return error.Overflow;
Expand Down

4 changes: 2 additions & 2 deletions
src/link/Elf/relocatable.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ pub fn flushStaticLib(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]co
 parsePositional(elf_file, obj.path) catch |err| switch (err) {
 error.MalformedObject,
 error.MalformedArchive,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.MismatchedEflags,
 => continue, // already reported
 error.UnknownFileType => try elf_file.reportParseError(obj.path, "unknown file type for an object file", .{}),
Expand DownExpand Up@@ -178,7 +178,7 @@ pub fn flushObject(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]const
 elf_file.parsePositional(obj.path, obj.must_link) catch |err| switch (err) {
 error.MalformedObject,
 error.MalformedArchive,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.MismatchedEflags,
 => continue, // already reported
 else => |e| try elf_file.reportParseError(
Expand Down

2 changes: 1 addition & 1 deletion
src/link/MachO.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -921,7 +921,7 @@ fn parseInputFileWorker(self: *MachO, file: File) void {
 error.MalformedObject,
 error.MalformedDylib,
 error.MalformedTbd,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.InvalidTarget,
 => {}, // already reported
 else => |e| self.reportParseError2(file.getIndex(), "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}) catch {},
Expand Down

4 changes: 2 additions & 2 deletions
src/link/MachO/Dylib.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,12 +75,12 @@ fn parseBinary(self: *Dylib, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (macho_file.getTarget().cpu.arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, header.sizeofcmds);
Expand Down

8 changes: 4 additions & 4 deletions
src/link/MachO/Object.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,12 +91,12 @@ pub fn parse(self: *Object, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (cpu_arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds);
Expand DownExpand Up@@ -1648,12 +1648,12 @@ pub fn parseAr(self: *Object, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (macho_file.getTarget().cpu.arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds);
Expand Down

2 changes: 1 addition & 1 deletion
src/link/MachO/relocatable.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,7 @@ fn parseInputFilesAr(macho_file: *MachO) !void {

 for (macho_file.objects.items) |index| {
 macho_file.getFile(index).?.parseAr(macho_file) catch |err| switch (err) {
 error.InvalidCpuArch => {}, // already reported
 error.InvalidMachineType => {}, // already reported
 else => |e| try macho_file.reportParseError2(index, "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}),
 };
 }
Expand Down

2 changes: 1 addition & 1 deletion
test/link/elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2257,7 +2257,7 @@ fn testMismatchedCpuArchitectureError(b: *Build, opts: Options) *Step {
 exe.linkLibC();

 expectLinkErrors(exe, test_step, .{ .exact = &.{
 "invalid cpu architecture: aarch64",
 "invalid ELF machine type: AARCH64",
 "note: while parsing /?/a.o",
 } });

Expand Down

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

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

 Merged

andrewrk
merged 2 commits into

from

Aug 25, 2024
 Merged

std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.
#21177
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a69f55a

std.{coff,elf}: Remove the {MachineType,EM}.toTargetCpuArch() functions.


alexrp Aug 19, 2024
fb6f5a3

link: Rename InvalidCpuArch error to InvalidMachineType.


alexrp Aug 23, 2024

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


17 changes: 0 additions & 17 deletions
lib/std/coff.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1060,23 +1060,6 @@ pub const MachineType = enum(u16) {
 WCEMIPSV2 = 0x169,

 _,

 pub fn toTargetCpuArch(machine_type: MachineType) ?std.Target.Cpu.Arch {
 return switch (machine_type) {
 .ARM => .arm,
 .POWERPC => .powerpc,
 .RISCV32 => .riscv32,
 .THUMB => .thumb,
 .I386 => .x86,
 .ARM64 => .aarch64,
 .RISCV64 => .riscv64,
 .X64 => .x86_64,
 .LOONGARCH32 => .loongarch32,
 .LOONGARCH64 => .loongarch64,
 // there's cases we don't (yet) handle
 else => null,
 };
 }
};

pub const CoffError = error{
Expand Down

38 changes: 0 additions & 38 deletions
lib/std/elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1646,44 +1646,6 @@ pub const EM = enum(u16) {
 FRV = 0x5441,

 _,

 pub fn toTargetCpuArch(em: EM) ?std.Target.Cpu.Arch {
 return switch (em) {
 .AVR => .avr,
 .MSP430 => .msp430,
 .ARC => .arc,
 .ARM => .arm,
 .HEXAGON => .hexagon,
 .@"68K" => .m68k,
 .MIPS => .mips,
 .MIPS_RS3_LE => .mipsel,
 .PPC => .powerpc,
 .SPARC => .sparc,
 .@"386" => .x86,
 .XCORE => .xcore,
 .CSR_KALIMBA => .kalimba,
 .LANAI => .lanai,
 .AARCH64 => .aarch64,
 .PPC64 => .powerpc64,
 .RISCV => .riscv64,
 .X86_64 => .x86_64,
 .BPF => .bpfel,
 .SPARCV9 => .sparc64,
 .S390 => .s390x,
 .SPU_2 => .spu_2,
 // FIXME:
 // No support for .loongarch32 yet so it is safe to assume we are on .loongarch64.
 //
 // However, when e_machine is .LOONGARCH, we should check
 // ei_class's value to decide the CPU architecture.
 // - ELFCLASS32 => .loongarch32
 // - ELFCLASS64 => .loongarch64
 .LOONGARCH => .loongarch64,
 // there's many cases we don't (yet) handle, or will never have a
 // zig target cpu arch equivalent (such as null).
 else => null,
 };
 }
};

pub const GRP_COMDAT = 1;
Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1100,7 +1100,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod
 error.MalformedObject,
 error.MalformedArchive,
 error.MismatchedEflags,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 => continue, // already reported
 else => |e| try self.reportParseError(
 obj.path,
Expand DownExpand Up@@ -1187,7 +1187,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod

 for (system_libs.items) |lib| {
 self.parseLibrary(lib, false) catch |err| switch (err) {
 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported
 error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported
 else => |e| try self.reportParseError(
 lib.path,
 "unexpected error: parsing library failed with error {s}",
Expand All@@ -1213,7 +1213,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod
 error.MalformedObject,
 error.MalformedArchive,
 error.MismatchedEflags,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 => continue, // already reported
 else => |e| try self.reportParseError(
 obj.path,
Expand DownExpand Up@@ -1642,7 +1642,7 @@ fn dumpArgv(self: *Elf, comp: *Compilation) !void {
pub const ParseError = error{
 MalformedObject,
 MalformedArchive,
InvalidCpuArch,
InvalidMachineType,
 MismatchedEflags,
 OutOfMemory,
 Overflow,
Expand DownExpand Up@@ -1813,7 +1813,7 @@ fn parseLdScript(self: *Elf, lib: SystemLib) ParseError!void {
 .needed = scr_obj.needed,
 .path = full_path,
 }, false) catch |err| switch (err) {
 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported
 error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported
 else => |e| try self.reportParseError(
 full_path,
 "unexpected error: parsing library failed with error {s}",
Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf/Object.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,14 +105,14 @@ fn parseCommon(self: *Object, allocator: Allocator, handle: std.fs.File, elf_fil
 defer allocator.free(header_buffer);
 self.header = @as(*align(1) const elf.Elf64_Ehdr, @ptrCast(header_buffer)).*;

 const target = elf_file.base.comp.root_mod.resolved_target.result;
 if (target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) {
 const em = elf_file.base.comp.root_mod.resolved_target.result.toElfMachine();
 if (em != self.header.?.e_machine) {
 try elf_file.reportParseError2(
 self.index,
 "invalid cpu architecture: {s}",
 .{@tagName(self.header.?.e_machine.toTargetCpuArch().?)},
 "invalid ELF machine type: {s}",
 .{@tagName(self.header.?.e_machine)},
 );
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }
 try elf_file.validateEFlags(self.index, self.header.?.e_flags);

Expand Down

10 changes: 5 additions & 5 deletions
src/link/Elf/SharedObject.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,14 +56,14 @@ pub fn parse(self: *SharedObject, elf_file: *Elf, handle: std.fs.File) !void {
 defer gpa.free(header_buffer);
 self.header = @as(*align(1) const elf.Elf64_Ehdr, @ptrCast(header_buffer)).*;

 const target = elf_file.base.comp.root_mod.resolved_target.result;
 if (target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) {
 const em = elf_file.base.comp.root_mod.resolved_target.result.toElfMachine();
 if (em != self.header.?.e_machine) {
 try elf_file.reportParseError2(
 self.index,
 "invalid cpu architecture: {s}",
 .{@tagName(self.header.?.e_machine.toTargetCpuArch().?)},
 "invalid ELF machine type: {s}",
 .{@tagName(self.header.?.e_machine)},
 );
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const shoff = std.math.cast(usize, self.header.?.e_shoff) orelse return error.Overflow;
Expand Down

4 changes: 2 additions & 2 deletions
src/link/Elf/relocatable.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ pub fn flushStaticLib(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]co
 parsePositional(elf_file, obj.path) catch |err| switch (err) {
 error.MalformedObject,
 error.MalformedArchive,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.MismatchedEflags,
 => continue, // already reported
 error.UnknownFileType => try elf_file.reportParseError(obj.path, "unknown file type for an object file", .{}),
Expand DownExpand Up@@ -178,7 +178,7 @@ pub fn flushObject(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]const
 elf_file.parsePositional(obj.path, obj.must_link) catch |err| switch (err) {
 error.MalformedObject,
 error.MalformedArchive,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.MismatchedEflags,
 => continue, // already reported
 else => |e| try elf_file.reportParseError(
Expand Down

2 changes: 1 addition & 1 deletion
src/link/MachO.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -921,7 +921,7 @@ fn parseInputFileWorker(self: *MachO, file: File) void {
 error.MalformedObject,
 error.MalformedDylib,
 error.MalformedTbd,
 error.InvalidCpuArch,
 error.InvalidMachineType,
 error.InvalidTarget,
 => {}, // already reported
 else => |e| self.reportParseError2(file.getIndex(), "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}) catch {},
Expand Down

4 changes: 2 additions & 2 deletions
src/link/MachO/Dylib.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,12 +75,12 @@ fn parseBinary(self: *Dylib, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (macho_file.getTarget().cpu.arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, header.sizeofcmds);
Expand Down

8 changes: 4 additions & 4 deletions
src/link/MachO/Object.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,12 +91,12 @@ pub fn parse(self: *Object, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (cpu_arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds);
Expand DownExpand Up@@ -1648,12 +1648,12 @@ pub fn parseAr(self: *Object, macho_file: *MachO) !void {
 macho.CPU_TYPE_X86_64 => .x86_64,
 else => |x| {
 try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 },
 };
 if (macho_file.getTarget().cpu.arch != this_cpu_arch) {
 try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)});
 return error.InvalidCpuArch;
 return error.InvalidMachineType;
 }

 const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds);
Expand Down

2 changes: 1 addition & 1 deletion
src/link/MachO/relocatable.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,7 @@ fn parseInputFilesAr(macho_file: *MachO) !void {

 for (macho_file.objects.items) |index| {
 macho_file.getFile(index).?.parseAr(macho_file) catch |err| switch (err) {
 error.InvalidCpuArch => {}, // already reported
 error.InvalidMachineType => {}, // already reported
 else => |e| try macho_file.reportParseError2(index, "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}),
 };
 }
Expand Down

2 changes: 1 addition & 1 deletion
test/link/elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2257,7 +2257,7 @@ fn testMismatchedCpuArchitectureError(b: *Build, opts: Options) *Step {
 exe.linkLibC();

 expectLinkErrors(exe, test_step, .{ .exact = &.{
 "invalid cpu architecture: aarch64",
 "invalid ELF machine type: AARCH64",
 "note: while parsing /?/a.o",
 } });

Expand Down