authorgravatar for 61841960+Arnau478@users.noreply.github.comArnau Camprubí <61841960+Arnau478@users.noreply.github.com> 2025-03-25 23:20:56+01:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-03-25 23:20:56+01:00
log8a8b3019f356d91f304a06f5302653ee0c3cee54
treec0491617db2fd59352c54942f9486e2237797970
parentcb8d7a811003b08a7e16c533577fee92113585b1
signaturebadge-check Signed by PGP key B5690EEEBB952194

Fix std.debug.dumpHex address offsets

1 files changed, 23 insertions(+), 1 deletions(-)

lib/std/debug.zig+23-1
...@@ -246,10 +246,14 @@ pub fn dumpHexFallible(bytes: []const u8) !void {...@@ -246,10 +246,14 @@ pub fn dumpHexFallible(bytes: []const u8) !void {
246 const stderr = std.io.getStdErr();246 const stderr = std.io.getStdErr();
247 const ttyconf = std.io.tty.detectConfig(stderr);247 const ttyconf = std.io.tty.detectConfig(stderr);
248 const writer = stderr.writer();248 const writer = stderr.writer();
249 try dumpHexInternal(bytes, ttyconf, writer);
250}
251
252fn dumpHexInternal(bytes: []const u8, ttyconf: std.io.tty.Config, writer: anytype) !void {
249 var chunks = mem.window(u8, bytes, 16, 16);253 var chunks = mem.window(u8, bytes, 16, 16);
250 while (chunks.next()) |window| {254 while (chunks.next()) |window| {
251 // 1. Print the address.255 // 1. Print the address.
252 const address = (@intFromPtr(bytes.ptr) + 0x10 * (chunks.index orelse 0) / 16) - 0x10;256 const address = (@intFromPtr(bytes.ptr) + 0x10 * (std.math.divCeil(usize, chunks.index orelse bytes.len, 16) catch unreachable)) - 0x10;
253 try ttyconf.setColor(writer, .dim);257 try ttyconf.setColor(writer, .dim);
254 // We print the address in lowercase and the bytes in uppercase hexadecimal to distinguish them more.258 // We print the address in lowercase and the bytes in uppercase hexadecimal to distinguish them more.
255 // Also, make sure all lines are aligned by padding the address.259 // Also, make sure all lines are aligned by padding the address.
...@@ -294,6 +298,24 @@ pub fn dumpHexFallible(bytes: []const u8) !void {...@@ -294,6 +298,24 @@ pub fn dumpHexFallible(bytes: []const u8) !void {
294 }298 }
295}299}
296300
301test dumpHexInternal {
302 const bytes: []const u8 = &.{ 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x01, 0x12, 0x13 };
303 var output = std.ArrayList(u8).init(std.testing.allocator);
304 defer output.deinit();
305 try dumpHexInternal(bytes, .no_color, output.writer());
306 const expected = try std.fmt.allocPrint(std.testing.allocator,
307 \\{x:0>[2]} 00 11 22 33 44 55 66 77 88 99 AA BB CC DD EE FF .."3DUfw........
308 \\{x:0>[2]} 01 12 13 ...
309 \\
310 , .{
311 @intFromPtr(bytes.ptr),
312 @intFromPtr(bytes.ptr) + 16,
313 @sizeOf(usize) * 2,
314 });
315 defer std.testing.allocator.free(expected);
316 try std.testing.expectEqualStrings(expected, output.items);
317}
318
297/// Tries to print the current stack trace to stderr, unbuffered, and ignores any error returned.319/// Tries to print the current stack trace to stderr, unbuffered, and ignores any error returned.
298/// TODO multithreaded awareness320/// TODO multithreaded awareness
299pub fn dumpCurrentStackTrace(start_addr: ?usize) void {321pub fn dumpCurrentStackTrace(start_addr: ?usize) void {