Skip to content

Commit

Permalink
Rename *[UI]LEB128 functions to *[UI]leb128
Browse files Browse the repository at this point in the history
  • Loading branch information
@mjbshaw @mlugg
mjbshaw authored and mlugg committed Jun 23, 2024
1 parent 0fcd59e commit 642093e
Show file tree
Hide file tree
Showing 18 changed files with 465 additions and 453 deletions.
128 changes: 64 additions & 64 deletions lib/std/Build/Step/CheckObject.zig
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions lib/std/compress/xz.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ pub fn Decompress(comptime ReaderType: type) type {

const counting_reader = counter.reader();

const record_count = try std.leb.readULEB128(u64, counting_reader);
const record_count = try std.leb.readUleb128(u64, counting_reader);
if (record_count != self.block_decoder.block_count)
return error.CorruptInput;

var i: usize = 0;
while (i < record_count) : (i += 1) {
// TODO: validate records
_ = try std.leb.readULEB128(u64, counting_reader);
_ = try std.leb.readULEB128(u64, counting_reader);
_ = try std.leb.readUleb128(u64, counting_reader);
_ = try std.leb.readUleb128(u64, counting_reader);
}

while (counter.bytes_read % 4 != 0) {
Expand Down
8 changes: 4 additions & 4 deletions lib/std/compress/xz/block.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ pub fn Decoder(comptime ReaderType: type) type {
return error.Unsupported;

if (flags.has_packed_size)
packed_size = try std.leb.readULEB128(u64, header_reader);
packed_size = try std.leb.readUleb128(u64, header_reader);

if (flags.has_unpacked_size)
unpacked_size = try std.leb.readULEB128(u64, header_reader);
unpacked_size = try std.leb.readUleb128(u64, header_reader);

const FilterId = enum(u64) {
lzma2 = 0x21,
Expand All @@ -123,7 +123,7 @@ pub fn Decoder(comptime ReaderType: type) type {

const filter_id = @as(
FilterId,
@enumFromInt(try std.leb.readULEB128(u64, header_reader)),
@enumFromInt(try std.leb.readUleb128(u64, header_reader)),
);

if (@intFromEnum(filter_id) >= 0x4000_0000_0000_0000)
Expand All @@ -132,7 +132,7 @@ pub fn Decoder(comptime ReaderType: type) type {
if (filter_id != .lzma2)
return error.Unsupported;

const properties_size = try std.leb.readULEB128(u64, header_reader);
const properties_size = try std.leb.readUleb128(u64, header_reader);
if (properties_size != 1)
return error.CorruptInput;

Expand Down
4 changes: 2 additions & 2 deletions lib/std/dwarf.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2762,11 +2762,11 @@ pub const FixedBufferReader = struct {
}

fn readUleb128(fbr: *FixedBufferReader, comptime T: type) Error!T {
return std.leb.readULEB128(T, fbr);
return std.leb.readUleb128(T, fbr);
}

fn readIleb128(fbr: *FixedBufferReader, comptime T: type) Error!T {
return std.leb.readILEB128(T, fbr);
return std.leb.readIleb128(T, fbr);
}

fn readAddress(fbr: *FixedBufferReader, format: Format) Error!u64 {
Expand Down
48 changes: 24 additions & 24 deletions lib/std/dwarf/call_frame.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const Opcode = enum(u8) {

fn readBlock(stream: *std.io.FixedBufferStream([]const u8)) ![]const u8 {
const reader = stream.reader();
const block_len = try leb.readULEB128(usize, reader);
const block_len = try leb.readUleb128(usize, reader);
if (stream.pos + block_len > stream.buffer.len) return error.InvalidOperand;

const block = stream.buffer[stream.pos..][0..block_len];
Expand Down Expand Up @@ -163,7 +163,7 @@ pub const Instruction = union(Opcode) {
.offset => .{
.offset = .{
.register = value,
.offset = try leb.readULEB128(u64, reader),
.offset = try leb.readUleb128(u64, reader),
},
},
.restore => .{
Expand Down Expand Up @@ -201,47 +201,47 @@ pub const Instruction = union(Opcode) {
},
.offset_extended => .{
.offset_extended = .{
.register = try leb.readULEB128(u8, reader),
.offset = try leb.readULEB128(u64, reader),
.register = try leb.readUleb128(u8, reader),
.offset = try leb.readUleb128(u64, reader),
},
},
.restore_extended => .{
.restore_extended = .{
.register = try leb.readULEB128(u8, reader),
.register = try leb.readUleb128(u8, reader),
},
},
.undefined => .{
.undefined = .{
.register = try leb.readULEB128(u8, reader),
.register = try leb.readUleb128(u8, reader),
},
},
.same_value => .{
.same_value = .{
.register = try leb.readULEB128(u8, reader),
.register = try leb.readUleb128(u8, reader),
},
},
.register => .{
.register = .{
.register = try leb.readULEB128(u8, reader),
.target_register = try leb.readULEB128(u8, reader),
.register = try leb.readUleb128(u8, reader),
.target_register = try leb.readUleb128(u8, reader),
},
},
.remember_state => .{ .remember_state = {} },
.restore_state => .{ .restore_state = {} },
.def_cfa => .{
.def_cfa = .{
.register = try leb.readULEB128(u8, reader),
.offset = try leb.readULEB128(u64, reader),
.register = try leb.readUleb128(u8, reader),
.offset = try leb.readUleb128(u64, reader),
},
},
.def_cfa_register => .{
.def_cfa_register = .{
.register = try leb.readULEB128(u8, reader),
.register = try leb.readUleb128(u8, reader),
},
},
.def_cfa_offset => .{
.def_cfa_offset = .{
.offset = try leb.readULEB128(u64, reader),
.offset = try leb.readUleb128(u64, reader),
},
},
.def_cfa_expression => .{
Expand All @@ -251,42 +251,42 @@ pub const Instruction = union(Opcode) {
},
.expression => .{
.expression = .{
.register = try leb.readULEB128(u8, reader),
.register = try leb.readUleb128(u8, reader),
.block = try readBlock(stream),
},
},
.offset_extended_sf => .{
.offset_extended_sf = .{
.register = try leb.readULEB128(u8, reader),
.offset = try leb.readILEB128(i64, reader),
.register = try leb.readUleb128(u8, reader),
.offset = try leb.readIleb128(i64, reader),
},
},
.def_cfa_sf => .{
.def_cfa_sf = .{
.register = try leb.readULEB128(u8, reader),
.offset = try leb.readILEB128(i64, reader),
.register = try leb.readUleb128(u8, reader),
.offset = try leb.readIleb128(i64, reader),
},
},
.def_cfa_offset_sf => .{
.def_cfa_offset_sf = .{
.offset = try leb.readILEB128(i64, reader),
.offset = try leb.readIleb128(i64, reader),
},
},
.val_offset => .{
.val_offset = .{
.register = try leb.readULEB128(u8, reader),
.offset = try leb.readULEB128(u64, reader),
.register = try leb.readUleb128(u8, reader),
.offset = try leb.readUleb128(u64, reader),
},
},
.val_offset_sf => .{
.val_offset_sf = .{
.register = try leb.readULEB128(u8, reader),
.offset = try leb.readILEB128(i64, reader),
.register = try leb.readUleb128(u8, reader),
.offset = try leb.readIleb128(i64, reader),
},
},
.val_expression => .{
.val_expression = .{
.register = try leb.readULEB128(u8, reader),
.register = try leb.readUleb128(u8, reader),
.block = try readBlock(stream),
},
},
Expand Down
Loading

0 comments on commit 642093e

Please sign in to comment.