Skip to content

Commit 41594c9

Browse files
kubkonkubkon
committed
Update leb128 references
1 parent 5c66aea commit 41594c9

File tree

6 files changed

+48
-48
lines changed

6 files changed

+48
-48
lines changed

‎src/Dwarf.zig‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ pub const InfoReader = struct {
8484
.dwarf64 => 12,
8585
} + cuh_length;
8686
while (p.pos < end_pos) {
87-
const di_code = try p.readULEB128(u64);
87+
const di_code = try p.readUleb128(u64);
8888
if (di_code == 0) return error.UnexpectedEndOfFile;
8989
if (di_code == code) return;
9090

@@ -187,14 +187,14 @@ pub const InfoReader = struct {
187187
dw.FORM.block1 => try p.readByte(),
188188
dw.FORM.block2 => try p.readInt(u16),
189189
dw.FORM.block4 => try p.readInt(u32),
190-
dw.FORM.block => try p.readULEB128(u64),
190+
dw.FORM.block => try p.readUleb128(u64),
191191
else => unreachable,
192192
};
193193
return p.readNBytes(len);
194194
}
195195

196196
pub fn readExprLoc(p: *InfoReader) ![]const u8 {
197-
const len: u64 = try p.readULEB128(u64);
197+
const len: u64 = try p.readUleb128(u64);
198198
return p.readNBytes(len);
199199
}
200200

@@ -204,7 +204,7 @@ pub const InfoReader = struct {
204204
dw.FORM.data2, dw.FORM.ref2 => try p.readInt(u16),
205205
dw.FORM.data4, dw.FORM.ref4 => try p.readInt(u32),
206206
dw.FORM.data8, dw.FORM.ref8, dw.FORM.ref_sig8 => try p.readInt(u64),
207-
dw.FORM.udata, dw.FORM.ref_udata => try p.readULEB128(u64),
207+
dw.FORM.udata, dw.FORM.ref_udata => try p.readUleb128(u64),
208208
dw.FORM.sdata => @bitCast(try p.readILEB128(i64)),
209209
else => return error.UnhandledForm,
210210
};
@@ -216,7 +216,7 @@ pub const InfoReader = struct {
216216
dw.FORM.strx2, dw.FORM.addrx2 => try p.readInt(u16),
217217
dw.FORM.strx3, dw.FORM.addrx3 => error.UnhandledForm,
218218
dw.FORM.strx4, dw.FORM.addrx4 => try p.readInt(u32),
219-
dw.FORM.strx, dw.FORM.addrx => try p.readULEB128(u64),
219+
dw.FORM.strx, dw.FORM.addrx => try p.readUleb128(u64),
220220
else => return error.UnhandledForm,
221221
};
222222
}
@@ -281,10 +281,10 @@ pub const InfoReader = struct {
281281
};
282282
}
283283

284-
pub fn readULEB128(p: *InfoReader, comptime Type: type) !Type {
284+
pub fn readUleb128(p: *InfoReader, comptime Type: type) !Type {
285285
var stream = std.io.fixedBufferStream(p.bytes()[p.pos..]);
286286
var creader = std.io.countingReader(stream.reader());
287-
const value: Type = try leb.readULEB128(Type, creader.reader());
287+
const value: Type = try leb.readUleb128(Type, creader.reader());
288288
p.pos += creader.bytes_read;
289289
return value;
290290
}
@@ -316,10 +316,10 @@ pub const AbbrevReader = struct {
316316

317317
pub fn readDecl(p: *AbbrevReader) !?AbbrevDecl {
318318
const pos = p.pos;
319-
const code = try p.readULEB128(Code);
319+
const code = try p.readUleb128(Code);
320320
if (code == 0) return null;
321321

322-
const tag = try p.readULEB128(Tag);
322+
const tag = try p.readUleb128(Tag);
323323
const has_children = (try p.readByte()) > 0;
324324
return .{
325325
.code = code,
@@ -332,8 +332,8 @@ pub const AbbrevReader = struct {
332332

333333
pub fn readAttr(p: *AbbrevReader) !?AbbrevAttr {
334334
const pos = p.pos;
335-
const at = try p.readULEB128(At);
336-
const form = try p.readULEB128(Form);
335+
const at = try p.readUleb128(At);
336+
const form = try p.readUleb128(Form);
337337
return if (at == 0 and form == 0) null else .{
338338
.at = at,
339339
.form = form,
@@ -348,10 +348,10 @@ pub const AbbrevReader = struct {
348348
return p.bytes()[p.pos];
349349
}
350350

351-
pub fn readULEB128(p: *AbbrevReader, comptime Type: type) !Type {
351+
pub fn readUleb128(p: *AbbrevReader, comptime Type: type) !Type {
352352
var stream = std.io.fixedBufferStream(p.bytes()[p.pos..]);
353353
var creader = std.io.countingReader(stream.reader());
354-
const value: Type = try leb.readULEB128(Type, creader.reader());
354+
const value: Type = try leb.readUleb128(Type, creader.reader());
355355
p.pos += creader.bytes_read;
356356
return value;
357357
}

‎src/Dylib.zig‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,11 @@ const TrieIterator = struct {
179179
return std.io.fixedBufferStream(it.data[it.pos..]);
180180
}
181181

182-
fn readULEB128(it: *TrieIterator) !u64 {
182+
fn readUleb128(it: *TrieIterator) !u64 {
183183
var stream = it.getStream();
184184
var creader = std.io.countingReader(stream.reader());
185185
const reader = creader.reader();
186-
const value = try std.leb.readULEB128(u64, reader);
186+
const value = try std.leb.readUleb128(u64, reader);
187187
it.pos += creader.bytes_read;
188188
return value;
189189
}
@@ -233,31 +233,31 @@ fn parseTrieNode(
233233
) !void {
234234
const tracy = trace(@src());
235235
defer tracy.end();
236-
const size = try it.readULEB128();
236+
const size = try it.readUleb128();
237237
if (size > 0) {
238-
const flags = try it.readULEB128();
238+
const flags = try it.readUleb128();
239239
const kind = flags & macho.EXPORT_SYMBOL_FLAGS_KIND_MASK;
240240
const out_flags = Export.Flags{
241241
.abs = kind == macho.EXPORT_SYMBOL_FLAGS_KIND_ABSOLUTE,
242242
.tlv = kind == macho.EXPORT_SYMBOL_FLAGS_KIND_THREAD_LOCAL,
243243
.weak = flags & macho.EXPORT_SYMBOL_FLAGS_WEAK_DEFINITION != 0,
244244
};
245245
if (flags & macho.EXPORT_SYMBOL_FLAGS_REEXPORT != 0) {
246-
_ = try it.readULEB128(); // dylib ordinal
246+
_ = try it.readUleb128(); // dylib ordinal
247247
const name = try it.readString();
248248
try self.exports.append(allocator, .{
249249
.name = try self.addString(allocator, if (name.len > 0) name else prefix),
250250
.flags = out_flags,
251251
});
252252
} else if (flags & macho.EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER != 0) {
253-
_ = try it.readULEB128(); // stub offset
254-
_ = try it.readULEB128(); // resolver offset
253+
_ = try it.readUleb128(); // stub offset
254+
_ = try it.readUleb128(); // resolver offset
255255
try self.exports.append(allocator, .{
256256
.name = try self.addString(allocator, prefix),
257257
.flags = out_flags,
258258
});
259259
} else {
260-
_ = try it.readULEB128(); // VM offset
260+
_ = try it.readUleb128(); // VM offset
261261
try self.exports.append(allocator, .{
262262
.name = try self.addString(allocator, prefix),
263263
.flags = out_flags,
@@ -269,7 +269,7 @@ fn parseTrieNode(
269269

270270
for (0..nedges) |_| {
271271
const label = try it.readString();
272-
const off = try it.readULEB128();
272+
const off = try it.readUleb128();
273273
const prefix_label = try std.fmt.allocPrint(arena, "{s}{s}", .{ prefix, label });
274274
const curr = it.pos;
275275
it.pos = off;

‎src/dyld_info/Rebase.zig‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,13 +227,13 @@ fn setTypePointer(writer: anytype) !void {
227227
fn setSegmentOffset(segment_id: u8, offset: u64, writer: anytype) !void {
228228
log.debug(">>> set segment: {d} and offset: {x}", .{ segment_id, offset });
229229
try writer.writeByte(macho.REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB | @as(u4, @truncate(segment_id)));
230-
try std.leb.writeULEB128(writer, offset);
230+
try std.leb.writeUleb128(writer, offset);
231231
}
232232

233233
fn rebaseAddAddr(addr: u64, writer: anytype) !void {
234234
log.debug(">>> rebase with add: {x}", .{addr});
235235
try writer.writeByte(macho.REBASE_OPCODE_DO_REBASE_ADD_ADDR_ULEB);
236-
try std.leb.writeULEB128(writer, addr);
236+
try std.leb.writeUleb128(writer, addr);
237237
}
238238

239239
fn rebaseTimes(count: usize, writer: anytype) !void {
@@ -242,15 +242,15 @@ fn rebaseTimes(count: usize, writer: anytype) !void {
242242
try writer.writeByte(macho.REBASE_OPCODE_DO_REBASE_IMM_TIMES | @as(u4, @truncate(count)));
243243
} else {
244244
try writer.writeByte(macho.REBASE_OPCODE_DO_REBASE_ULEB_TIMES);
245-
try std.leb.writeULEB128(writer, count);
245+
try std.leb.writeUleb128(writer, count);
246246
}
247247
}
248248

249249
fn rebaseTimesSkip(count: usize, skip: u64, writer: anytype) !void {
250250
log.debug(">>> rebase with count: {d} and skip: {x}", .{ count, skip });
251251
try writer.writeByte(macho.REBASE_OPCODE_DO_REBASE_ULEB_TIMES_SKIPPING_ULEB);
252-
try std.leb.writeULEB128(writer, count);
253-
try std.leb.writeULEB128(writer, skip);
252+
try std.leb.writeUleb128(writer, count);
253+
try std.leb.writeUleb128(writer, skip);
254254
}
255255

256256
fn addAddr(addr: u64, writer: anytype) !void {
@@ -263,7 +263,7 @@ fn addAddr(addr: u64, writer: anytype) !void {
263263
}
264264
}
265265
try writer.writeByte(macho.REBASE_OPCODE_ADD_ADDR_ULEB);
266-
try std.leb.writeULEB128(writer, addr);
266+
try std.leb.writeUleb128(writer, addr);
267267
}
268268

269269
fn done(writer: anytype) !void {

‎src/dyld_info/Trie.zig‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ fn finalizeNode(self: *Trie, node_index: Node.Index, offset_in_trie: u32) !Final
189189
if (slice.items(.is_terminal)[node_index]) {
190190
const export_flags = slice.items(.export_flags)[node_index];
191191
const vmaddr_offset = slice.items(.vmaddr_offset)[node_index];
192-
try leb.writeULEB128(writer, export_flags);
193-
try leb.writeULEB128(writer, vmaddr_offset);
194-
try leb.writeULEB128(writer, stream.bytes_written);
192+
try leb.writeUleb128(writer, export_flags);
193+
try leb.writeUleb128(writer, vmaddr_offset);
194+
try leb.writeUleb128(writer, stream.bytes_written);
195195
} else {
196196
node_size += 1; // 0x0 for non-terminal nodes
197197
}
@@ -201,7 +201,7 @@ fn finalizeNode(self: *Trie, node_index: Node.Index, offset_in_trie: u32) !Final
201201
const edge = &self.edges.items[edge_index];
202202
const next_node_offset = slice.items(.trie_offset)[edge.node];
203203
node_size += @intCast(edge.label.len + 1);
204-
try leb.writeULEB128(writer, next_node_offset);
204+
try leb.writeUleb128(writer, next_node_offset);
205205
}
206206

207207
const trie_offset = slice.items(.trie_offset)[node_index];
@@ -251,13 +251,13 @@ fn writeNode(self: *Trie, node_index: Node.Index, writer: anytype) !void {
251251
// TODO Implement for special flags.
252252
assert(export_flags & macho.EXPORT_SYMBOL_FLAGS_REEXPORT == 0 and
253253
export_flags & macho.EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER == 0);
254-
try leb.writeULEB128(info_stream.writer(), export_flags);
255-
try leb.writeULEB128(info_stream.writer(), vmaddr_offset);
254+
try leb.writeUleb128(info_stream.writer(), export_flags);
255+
try leb.writeUleb128(info_stream.writer(), vmaddr_offset);
256256

257257
// Encode the size of the terminal node info.
258258
var size_buf: [@sizeOf(u64)]u8 = undefined;
259259
var size_stream = std.io.fixedBufferStream(&size_buf);
260-
try leb.writeULEB128(size_stream.writer(), info_stream.pos);
260+
try leb.writeUleb128(size_stream.writer(), info_stream.pos);
261261

262262
// Now, write them to the output stream.
263263
try writer.writeAll(size_buf[0..size_stream.pos]);
@@ -274,7 +274,7 @@ fn writeNode(self: *Trie, node_index: Node.Index, writer: anytype) !void {
274274
// Write edge label and offset to next node in trie.
275275
try writer.writeAll(edge.label);
276276
try writer.writeByte(0);
277-
try leb.writeULEB128(writer, slice.items(.trie_offset)[edge.node]);
277+
try leb.writeUleb128(writer, slice.items(.trie_offset)[edge.node]);
278278
}
279279
}
280280

‎src/dyld_info/bind.zig‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ pub const LazyBind = struct {
610610
fn setSegmentOffset(segment_id: u8, offset: u64, writer: anytype) !void {
611611
log.debug(">>> set segment: {d} and offset: {x}", .{ segment_id, offset });
612612
try writer.writeByte(macho.BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB | @as(u4, @truncate(segment_id)));
613-
try std.leb.writeULEB128(writer, offset);
613+
try std.leb.writeUleb128(writer, offset);
614614
}
615615

616616
fn setSymbol(name: []const u8, flags: u8, writer: anytype) !void {
@@ -644,15 +644,15 @@ fn setDylibOrdinal(ordinal: i16, writer: anytype) !void {
644644
try writer.writeByte(macho.BIND_OPCODE_SET_DYLIB_ORDINAL_IMM | @as(u4, @truncate(cast)));
645645
} else {
646646
try writer.writeByte(macho.BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB);
647-
try std.leb.writeULEB128(writer, cast);
647+
try std.leb.writeUleb128(writer, cast);
648648
}
649649
}
650650
}
651651

652652
fn setAddend(addend: i64, writer: anytype) !void {
653653
log.debug(">>> set addend: {x}", .{addend});
654654
try writer.writeByte(macho.BIND_OPCODE_SET_ADDEND_SLEB);
655-
try std.leb.writeILEB128(writer, addend);
655+
try std.leb.writeIleb128(writer, addend);
656656
}
657657

658658
fn doBind(writer: anytype) !void {
@@ -672,20 +672,20 @@ fn doBindAddAddr(addr: u64, writer: anytype) !void {
672672
}
673673
}
674674
try writer.writeByte(macho.BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB);
675-
try std.leb.writeULEB128(writer, addr);
675+
try std.leb.writeUleb128(writer, addr);
676676
}
677677

678678
fn doBindTimesSkip(count: usize, skip: u64, writer: anytype) !void {
679679
log.debug(">>> bind with count: {d} and skip: {x}", .{ count, skip });
680680
try writer.writeByte(macho.BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB);
681-
try std.leb.writeULEB128(writer, count);
682-
try std.leb.writeULEB128(writer, skip);
681+
try std.leb.writeUleb128(writer, count);
682+
try std.leb.writeUleb128(writer, skip);
683683
}
684684

685685
fn addAddr(addr: u64, writer: anytype) !void {
686686
log.debug(">>> add: {x}", .{addr});
687687
try writer.writeByte(macho.BIND_OPCODE_ADD_ADDR_ULEB);
688-
try std.leb.writeULEB128(writer, addr);
688+
try std.leb.writeUleb128(writer, addr);
689689
}
690690

691691
fn done(writer: anytype) !void {

‎src/eh_frame.zig‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ pub const Cie = struct {
2121
var creader = std.io.countingReader(stream.reader());
2222
const reader = creader.reader();
2323

24-
_ = try leb.readULEB128(u64, reader); // code alignment factor
25-
_ = try leb.readULEB128(u64, reader); // data alignment factor
26-
_ = try leb.readULEB128(u64, reader); // return address register
27-
_ = try leb.readULEB128(u64, reader); // augmentation data length
24+
_ = try leb.readUleb128(u64, reader); // code alignment factor
25+
_ = try leb.readUleb128(u64, reader); // data alignment factor
26+
_ = try leb.readUleb128(u64, reader); // return address register
27+
_ = try leb.readUleb128(u64, reader); // augmentation data length
2828

2929
for (aug[1..]) |ch| switch (ch) {
3030
'R' => {
@@ -199,7 +199,7 @@ pub const Fde = struct {
199199
var stream = std.io.fixedBufferStream(data[24..]);
200200
var creader = std.io.countingReader(stream.reader());
201201
const reader = creader.reader();
202-
_ = try leb.readULEB128(u64, reader); // augmentation length
202+
_ = try leb.readUleb128(u64, reader); // augmentation length
203203
fde.lsda_ptr_offset = @intCast(creader.bytes_read + 24);
204204
const lsda_ptr = switch (lsda_size) {
205205
.p32 => try reader.readInt(i32, .little),

0 commit comments

Comments
 (0)