motiejus/zig
1
Fork 0
Code Releases Activity

link: Rename InvalidCpuArch error to InvalidMachineType.

Browse Source
This commit is contained in:
Alex Rønne Petersen
2024-08-23 10:40:35 +02:00
parent a69f55a7cc
commit fb6f5a30b2
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/link/Elf.zig
View File

@@ -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,
@@ -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}",
@@ -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,
@@ -1642,7 +1642,7 @@ fn dumpArgv(self: *Elf, comp: *Compilation) !void {
pub const ParseError = error{
MalformedObject,
MalformedArchive,
InvalidCpuArch,
InvalidMachineType,
MismatchedEflags,
OutOfMemory,
Overflow,
@@ -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}",

2
src/link/Elf/Object.zig
View File

@@ -112,7 +112,7 @@ fn parseCommon(self: *Object, allocator: Allocator, handle: std.fs.File, elf_fil
"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);

2
src/link/Elf/SharedObject.zig
View File

@@ -63,7 +63,7 @@ pub fn parse(self: *SharedObject, elf_file: *Elf, handle: std.fs.File) !void {
"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;

4
src/link/Elf/relocatable.zig
View File

@@ -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", .{}),
@@ -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(

2
src/link/MachO.zig
View File

@@ -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 {},

4
src/link/MachO/Dylib.zig
View File

@@ -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);

8
src/link/MachO/Object.zig
View File

@@ -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);
@@ -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);

2
src/link/MachO/relocatable.zig
View File

@@ -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)}),
};
}