RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 06:14:58 +00:00
Code Issues Activity Actions

HackStudio: Use new format functions.

Browse source
This commit is contained in:
asynts 2020-10-08 13:41:36 +02:00 • committed by Andreas Kling
parent 3b601cd4bd
commit 7c4fb2b804
23 changed files with 112 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

9
DevTools/HackStudio/Debugger/DisassemblyModel.cpp
View file

@ -40,7 +40,7 @@ DisassemblyModel::DisassemblyModel(const Debug::DebugSession& debug_session, con
{
auto containing_function = debug_session.debug_info().get_containing_function(regs.eip);
if (!containing_function.has_value()) {
dbg() << "Cannot disassemble as the containing function was not found.";
dbgln("Cannot disassemble as the containing function was not found.");
return;
}
@ -110,12 +110,11 @@ GUI::Variant DisassemblyModel::data(const GUI::ModelIndex& index, GUI::ModelRole
if (role == GUI::ModelRole::Display) {
if (index.column() == Column::Address)
return String::format("%#08x", insn.address);
return String::formatted("{:p}", insn.address);
if (index.column() == Column::InstructionBytes) {
StringBuilder builder;
for (auto ch : insn.bytes) {
builder.appendf("%02x ", (u8)ch);
}
for (auto ch : insn.bytes)
builder.appendff("{:02x} ", static_cast<unsigned char>(ch));
return builder.to_string();
}
if (index.column() == Column::Disassembly)