From 4076619655544d64e14709f9508859ef6c116630 Mon Sep 17 00:00:00 2001 From: Simon Wanner Date: Fri, 25 Mar 2022 22:27:31 +0100 Subject: [PATCH] disasm: Print virtual offsets with pointer semantics Instead of assuming the virtual offset will be 8 hex digits (which is OK for 32 bit values), just use the ":p" modifier to ensure it prints the virtual offset as a pointer, so if the code is compiled for 64 bit CPUs, it will use 16 hex digits accordingly. --- Userland/Utilities/disasm.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Userland/Utilities/disasm.cpp b/Userland/Utilities/disasm.cpp index 1b998c3625..f1c6b3b225 100644 --- a/Userland/Utilities/disasm.cpp +++ b/Userland/Utilities/disasm.cpp @@ -132,14 +132,14 @@ ErrorOr serenity_main(Main::Arguments args) size_t length = insn.value().length(); StringBuilder builder; - builder.appendff("{: 8x}:\t", virtual_offset); + builder.appendff("{:p} ", virtual_offset); for (size_t i = 0; i < 7; i++) { if (i < length) builder.appendff("{:02x} ", asm_data[offset + i]); else builder.append(" "sv); } - builder.append("\t"sv); + builder.append(" "sv); builder.append(insn.value().to_string(virtual_offset, symbol_provider)); outln("{}", builder.string_view());