authorgravatar for john.schmidt.h@gmail.comJohn Schmidt <john.schmidt.h@gmail.com> 2022-01-24 21:40:19+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-01-28 21:03:21-05:00
log63ee6e662582ee75ac804eb1a4dbdf4457b8f2d0
treeac3694e98699bc57de2c5cc5b060c0c9e437c12e
parent39083c31a550ed80f369f60d35791e98904b8096

Rename mem.bswapAllFields to byteSwapAllFields

To match the renaming of `@bswap` to `@byteSwap` in https://github.com/ziglang/zig/commit/1fdb24827fb51351d5e31103069619668fae31c4.

5 files changed, 26 insertions(+), 23 deletions(-)

lib/std/elf.zig+4-4
......@@ -424,7 +424,7 @@ pub fn ProgramHeaderIterator(ParseSource: anytype) type {
424424 if (self.elf_header.endian == native_endian) return phdr;
425425
426426 // Convert fields to native endianness.
427 mem.bswapAllFields(Elf64_Phdr, &phdr);
427 mem.byteSwapAllFields(Elf64_Phdr, &phdr);
428428 return phdr;
429429 }
430430
......@@ -436,7 +436,7 @@ pub fn ProgramHeaderIterator(ParseSource: anytype) type {
436436 // ELF endianness does NOT match native endianness.
437437 if (self.elf_header.endian != native_endian) {
438438 // Convert fields to native endianness.
439 mem.bswapAllFields(Elf32_Phdr, &phdr);
439 mem.byteSwapAllFields(Elf32_Phdr, &phdr);
440440 }
441441
442442 // Convert 32-bit header to 64-bit.
......@@ -474,7 +474,7 @@ pub fn SectionHeaderIterator(ParseSource: anytype) type {
474474 if (self.elf_header.endian == native_endian) return shdr;
475475
476476 // Convert fields to native endianness.
477 mem.bswapAllFields(Elf64_Shdr, &shdr);
477 mem.byteSwapAllFields(Elf64_Shdr, &shdr);
478478 return shdr;
479479 }
480480
......@@ -486,7 +486,7 @@ pub fn SectionHeaderIterator(ParseSource: anytype) type {
486486 // ELF endianness does NOT match native endianness.
487487 if (self.elf_header.endian != native_endian) {
488488 // Convert fields to native endianness.
489 mem.bswapAllFields(Elf32_Shdr, &shdr);
489 mem.byteSwapAllFields(Elf32_Shdr, &shdr);
490490 }
491491
492492 // Convert 32-bit header to 64-bit.
lib/std/mem.zig+7-4
......@@ -1522,16 +1522,19 @@ test "writeIntBig and writeIntLittle" {
15221522 try testing.expect(eql(u8, buf2[0..], &[_]u8{ 0xfc, 0xff }));
15231523}
15241524
1525/// TODO delete this deprecated declaration after 0.10.0 is released
1526pub const bswapAllFields = @compileError("bswapAllFields has been renamed to byteSwapAllFields");
1527
15251528/// Swap the byte order of all the members of the fields of a struct
15261529/// (Changing their endianess)
1527pub fn bswapAllFields(comptime S: type, ptr: *S) void {
1528 if (@typeInfo(S) != .Struct) @compileError("bswapAllFields expects a struct as the first argument");
1530pub fn byteSwapAllFields(comptime S: type, ptr: *S) void {
1531 if (@typeInfo(S) != .Struct) @compileError("byteSwapAllFields expects a struct as the first argument");
15291532 inline for (std.meta.fields(S)) |f| {
15301533 @field(ptr, f.name) = @byteSwap(f.field_type, @field(ptr, f.name));
15311534 }
15321535}
15331536
1534test "bswapAllFields" {
1537test "byteSwapAllFields" {
15351538 const T = extern struct {
15361539 f0: u8,
15371540 f1: u16,
......@@ -1542,7 +1545,7 @@ test "bswapAllFields" {
15421545 .f1 = 0x1234,
15431546 .f2 = 0x12345678,
15441547 };
1545 bswapAllFields(T, &s);
1548 byteSwapAllFields(T, &s);
15461549 try std.testing.expectEqual(T{
15471550 .f0 = 0x12,
15481551 .f1 = 0x3412,
lib/std/tz.zig+2-2
......@@ -60,7 +60,7 @@ pub const Tz = struct {
6060 if (legacy_header.version != 0 and legacy_header.version != '2' and legacy_header.version != '3') return error.BadVersion;
6161
6262 if (builtin.target.cpu.arch.endian() != std.builtin.Endian.Big) {
63 std.mem.bswapAllFields(@TypeOf(legacy_header.counts), &legacy_header.counts);
63 std.mem.byteSwapAllFields(@TypeOf(legacy_header.counts), &legacy_header.counts);
6464 }
6565
6666 if (legacy_header.version == 0) {
......@@ -74,7 +74,7 @@ pub const Tz = struct {
7474 if (!std.mem.eql(u8, &header.magic, "TZif")) return error.BadHeader;
7575 if (header.version != '2' and header.version != '3') return error.BadVersion;
7676 if (builtin.target.cpu.arch.endian() != std.builtin.Endian.Big) {
77 std.mem.bswapAllFields(@TypeOf(header.counts), &header.counts);
77 std.mem.byteSwapAllFields(@TypeOf(header.counts), &header.counts);
7878 }
7979
8080 return parseBlock(allocator, reader, header, false);
src/link/Elf.zig+12-12
......@@ -1204,7 +1204,7 @@ pub fn flushModule(self: *Elf, comp: *Compilation) !void {
12041204 for (buf) |*phdr, i| {
12051205 phdr.* = progHeaderTo32(self.program_headers.items[i]);
12061206 if (foreign_endian) {
1207 mem.bswapAllFields(elf.Elf32_Phdr, phdr);
1207 mem.byteSwapAllFields(elf.Elf32_Phdr, phdr);
12081208 }
12091209 }
12101210 try self.base.file.?.pwriteAll(mem.sliceAsBytes(buf), self.phdr_table_offset.?);
......@@ -1216,7 +1216,7 @@ pub fn flushModule(self: *Elf, comp: *Compilation) !void {
12161216 for (buf) |*phdr, i| {
12171217 phdr.* = self.program_headers.items[i];
12181218 if (foreign_endian) {
1219 mem.bswapAllFields(elf.Elf64_Phdr, phdr);
1219 mem.byteSwapAllFields(elf.Elf64_Phdr, phdr);
12201220 }
12211221 }
12221222 try self.base.file.?.pwriteAll(mem.sliceAsBytes(buf), self.phdr_table_offset.?);
......@@ -1293,7 +1293,7 @@ pub fn flushModule(self: *Elf, comp: *Compilation) !void {
12931293 shdr.* = sectHeaderTo32(self.sections.items[i]);
12941294 log.debug("writing section {}", .{shdr.*});
12951295 if (foreign_endian) {
1296 mem.bswapAllFields(elf.Elf32_Shdr, shdr);
1296 mem.byteSwapAllFields(elf.Elf32_Shdr, shdr);
12971297 }
12981298 }
12991299 try self.base.file.?.pwriteAll(mem.sliceAsBytes(buf), self.shdr_table_offset.?);
......@@ -1306,7 +1306,7 @@ pub fn flushModule(self: *Elf, comp: *Compilation) !void {
13061306 shdr.* = self.sections.items[i];
13071307 log.debug("writing section {}", .{shdr.*});
13081308 if (foreign_endian) {
1309 mem.bswapAllFields(elf.Elf64_Shdr, shdr);
1309 mem.byteSwapAllFields(elf.Elf64_Shdr, shdr);
13101310 }
13111311 }
13121312 try self.base.file.?.pwriteAll(mem.sliceAsBytes(buf), self.shdr_table_offset.?);
......@@ -3097,14 +3097,14 @@ fn writeProgHeader(self: *Elf, index: usize) !void {
30973097 .p32 => {
30983098 var phdr = [1]elf.Elf32_Phdr{progHeaderTo32(self.program_headers.items[index])};
30993099 if (foreign_endian) {
3100 mem.bswapAllFields(elf.Elf32_Phdr, &phdr[0]);
3100 mem.byteSwapAllFields(elf.Elf32_Phdr, &phdr[0]);
31013101 }
31023102 return self.base.file.?.pwriteAll(mem.sliceAsBytes(&phdr), offset);
31033103 },
31043104 .p64 => {
31053105 var phdr = [1]elf.Elf64_Phdr{self.program_headers.items[index]};
31063106 if (foreign_endian) {
3107 mem.bswapAllFields(elf.Elf64_Phdr, &phdr[0]);
3107 mem.byteSwapAllFields(elf.Elf64_Phdr, &phdr[0]);
31083108 }
31093109 return self.base.file.?.pwriteAll(mem.sliceAsBytes(&phdr), offset);
31103110 },
......@@ -3118,7 +3118,7 @@ fn writeSectHeader(self: *Elf, index: usize) !void {
31183118 var shdr: [1]elf.Elf32_Shdr = undefined;
31193119 shdr[0] = sectHeaderTo32(self.sections.items[index]);
31203120 if (foreign_endian) {
3121 mem.bswapAllFields(elf.Elf32_Shdr, &shdr[0]);
3121 mem.byteSwapAllFields(elf.Elf32_Shdr, &shdr[0]);
31223122 }
31233123 const offset = self.shdr_table_offset.? + index * @sizeOf(elf.Elf32_Shdr);
31243124 return self.base.file.?.pwriteAll(mem.sliceAsBytes(&shdr), offset);
......@@ -3126,7 +3126,7 @@ fn writeSectHeader(self: *Elf, index: usize) !void {
31263126 .p64 => {
31273127 var shdr = [1]elf.Elf64_Shdr{self.sections.items[index]};
31283128 if (foreign_endian) {
3129 mem.bswapAllFields(elf.Elf64_Shdr, &shdr[0]);
3129 mem.byteSwapAllFields(elf.Elf64_Shdr, &shdr[0]);
31303130 }
31313131 const offset = self.shdr_table_offset.? + index * @sizeOf(elf.Elf64_Shdr);
31323132 return self.base.file.?.pwriteAll(mem.sliceAsBytes(&shdr), offset);
......@@ -3224,7 +3224,7 @@ fn writeSymbol(self: *Elf, index: usize) !void {
32243224 },
32253225 };
32263226 if (foreign_endian) {
3227 mem.bswapAllFields(elf.Elf32_Sym, &sym[0]);
3227 mem.byteSwapAllFields(elf.Elf32_Sym, &sym[0]);
32283228 }
32293229 const off = syms_sect.sh_offset + @sizeOf(elf.Elf32_Sym) * index;
32303230 try self.base.file.?.pwriteAll(mem.sliceAsBytes(sym[0..1]), off);
......@@ -3232,7 +3232,7 @@ fn writeSymbol(self: *Elf, index: usize) !void {
32323232 .p64 => {
32333233 var sym = [1]elf.Elf64_Sym{self.local_symbols.items[index]};
32343234 if (foreign_endian) {
3235 mem.bswapAllFields(elf.Elf64_Sym, &sym[0]);
3235 mem.byteSwapAllFields(elf.Elf64_Sym, &sym[0]);
32363236 }
32373237 const off = syms_sect.sh_offset + @sizeOf(elf.Elf64_Sym) * index;
32383238 try self.base.file.?.pwriteAll(mem.sliceAsBytes(sym[0..1]), off);
......@@ -3263,7 +3263,7 @@ fn writeAllGlobalSymbols(self: *Elf) !void {
32633263 .st_shndx = self.global_symbols.items[i].st_shndx,
32643264 };
32653265 if (foreign_endian) {
3266 mem.bswapAllFields(elf.Elf32_Sym, sym);
3266 mem.byteSwapAllFields(elf.Elf32_Sym, sym);
32673267 }
32683268 }
32693269 try self.base.file.?.pwriteAll(mem.sliceAsBytes(buf), global_syms_off);
......@@ -3282,7 +3282,7 @@ fn writeAllGlobalSymbols(self: *Elf) !void {
32823282 .st_shndx = self.global_symbols.items[i].st_shndx,
32833283 };
32843284 if (foreign_endian) {
3285 mem.bswapAllFields(elf.Elf64_Sym, sym);
3285 mem.byteSwapAllFields(elf.Elf64_Sym, sym);
32863286 }
32873287 }
32883288 try self.base.file.?.pwriteAll(mem.sliceAsBytes(buf), global_syms_off);
src/link/MachO/fat.zig+1-1
......@@ -24,7 +24,7 @@ fn readFatStruct(reader: anytype, comptime T: type) !T {
2424 // disk in big endian order.
2525 var res = try reader.readStruct(T);
2626 if (native_endian != std.builtin.Endian.Big) {
27 mem.bswapAllFields(T, &res);
27 mem.byteSwapAllFields(T, &res);
2828 }
2929 return res;
3030}