summaryrefslogtreecommitdiff
path: root/Userland/DevTools/UserspaceEmulator
diff options
context:
space:
mode:
authorLinus Groh <mail@linusgroh.de>2022-12-06 01:12:49 +0000
committerAndreas Kling <kling@serenityos.org>2022-12-06 08:54:33 +0100
commit57dc179b1fce5d4b7171311b04667debfe693095 (patch)
treea459d1aef92dc4e49bbf03b32621b1e7e30d4e64 /Userland/DevTools/UserspaceEmulator
parent6e19ab2bbce0b113b628e6f8e9b5c0640053933e (diff)
downloadserenity-57dc179b1fce5d4b7171311b04667debfe693095.zip
Everywhere: Rename to_{string => deprecated_string}() where applicable
This will make it easier to support both string types at the same time while we convert code, and tracking down remaining uses. One big exception is Value::to_string() in LibJS, where the name is dictated by the ToString AO.
Diffstat (limited to 'Userland/DevTools/UserspaceEmulator')
-rw-r--r--Userland/DevTools/UserspaceEmulator/Emulator.cpp6
-rw-r--r--Userland/DevTools/UserspaceEmulator/main.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/Userland/DevTools/UserspaceEmulator/Emulator.cpp b/Userland/DevTools/UserspaceEmulator/Emulator.cpp
index 641ce3d4c4..4c60a12c5a 100644
--- a/Userland/DevTools/UserspaceEmulator/Emulator.cpp
+++ b/Userland/DevTools/UserspaceEmulator/Emulator.cpp
@@ -237,7 +237,7 @@ int Emulator::exec()
auto insn = X86::Instruction::from_stream(*m_cpu, X86::OperandSize::Size32, X86::AddressSize::Size32);
// Exec cycle
if constexpr (trace) {
- outln("{:p} \033[33;1m{}\033[0m", m_cpu->base_eip(), insn.to_string(m_cpu->base_eip(), symbol_provider));
+ outln("{:p} \033[33;1m{}\033[0m", m_cpu->base_eip(), insn.to_deprecated_string(m_cpu->base_eip(), symbol_provider));
}
(m_cpu->*insn.handler())(insn);
@@ -529,9 +529,9 @@ DeprecatedString Emulator::create_instruction_line(FlatPtr address, X86::Instruc
{
auto symbol = symbol_at(address);
if (!symbol.has_value() || !symbol->source_position.has_value())
- return DeprecatedString::formatted("{:p}: {}", address, insn.to_string(address));
+ return DeprecatedString::formatted("{:p}: {}", address, insn.to_deprecated_string(address));
- return DeprecatedString::formatted("{:p}: {} \e[34;1m{}\e[0m:{}", address, insn.to_string(address), LexicalPath::basename(symbol->source_position->file_path), symbol->source_position.value().line_number);
+ return DeprecatedString::formatted("{:p}: {} \e[34;1m{}\e[0m:{}", address, insn.to_deprecated_string(address), LexicalPath::basename(symbol->source_position->file_path), symbol->source_position.value().line_number);
}
static void emulator_signal_handler(int signum, siginfo_t* signal_info, void* context)
diff --git a/Userland/DevTools/UserspaceEmulator/main.cpp b/Userland/DevTools/UserspaceEmulator/main.cpp
index 430afeae0a..f62b1f2b2a 100644
--- a/Userland/DevTools/UserspaceEmulator/main.cpp
+++ b/Userland/DevTools/UserspaceEmulator/main.cpp
@@ -104,7 +104,7 @@ int main(int argc, char** argv, char** env)
perror("set_process_name");
return 1;
}
- int rc = pthread_setname_np(pthread_self(), builder.to_string().characters());
+ int rc = pthread_setname_np(pthread_self(), builder.to_deprecated_string().characters());
if (rc != 0) {
reportln("pthread_setname_np: {}"sv, strerror(rc));
return 1;