RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 07:47:35 +00:00
Code Issues Activity Actions

disasm: Print virtual offsets with pointer semantics

Browse source 
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.
This commit is contained in:
Simon Wanner 2022-03-25 22:27:31 +01:00 • committed by Andreas Kling
parent c5681e06c6
commit 4076619655
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Utilities/disasm.cpp
View file

@ -132,14 +132,14 @@ ErrorOr<int> serenity_main(Main::Arguments args)
size_t length = insn.value().length(); size_t length = insn.value().length();
StringBuilder builder; StringBuilder builder;
builder.appendff("{: 8x}:\t", virtual_offset); builder.appendff("{:p} ", virtual_offset);
for (size_t i = 0; i < 7; i++) { for (size_t i = 0; i < 7; i++) {
if (i < length) if (i < length)
builder.appendff("{:02x} ", asm_data[offset + i]); builder.appendff("{:02x} ", asm_data[offset + i]);
else else
builder.append(" "sv); builder.append(" "sv);
} }
builder.append("\t"sv); builder.append(" "sv);
builder.append(insn.value().to_string(virtual_offset, symbol_provider)); builder.append(insn.value().to_string(virtual_offset, symbol_provider));
outln("{}", builder.string_view()); outln("{}", builder.string_view());