RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:07:34 +00:00
Code Issues Activity Actions

UserspaceEmulator: Fix after add_positional_argument API change :^)

Browse source 
Get UE compiling again after the Vector<String> API was changed to
Vector<StringView>.
This commit is contained in:
Brian Gianforcaro 2021-11-26 16:11:07 -08:00 • committed by Brian Gianforcaro
parent 957f54d96f
commit f807796380
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/DevTools/UserspaceEmulator/Emulator.cpp
View file

@ -41,7 +41,7 @@ Emulator& Emulator::the()
return *s_the; return *s_the;
} }
Emulator::Emulator(String const& executable_path, Vector<String> const& arguments, Vector<String> const& environment) Emulator::Emulator(String const& executable_path, Vector<StringView> const& arguments, Vector<String> const& environment)
: m_executable_path(executable_path) : m_executable_path(executable_path)
, m_arguments(arguments) , m_arguments(arguments)
, m_environment(environment) , m_environment(environment)
@ -103,7 +103,7 @@ void Emulator::setup_stack(Vector<ELF::AuxiliaryValue> aux_vector)
Vector<u32> argv_entries; Vector<u32> argv_entries;
for (auto& argument : m_arguments) { for (auto& argument : m_arguments) {
m_cpu.push_string(argument.characters()); m_cpu.push_string(argument);
argv_entries.append(m_cpu.esp().value()); argv_entries.append(m_cpu.esp().value());
} }

4
Userland/DevTools/UserspaceEmulator/Emulator.h
View file

@ -31,7 +31,7 @@ class Emulator {
public: public:
static Emulator& the(); static Emulator& the();
Emulator(String const& executable_path, Vector<String> const& arguments, Vector<String> const& environment); Emulator(String const& executable_path, Vector<StringView> const& arguments, Vector<String> const& environment);
void set_profiling_details(bool should_dump_profile, size_t instruction_interval, OutputFileStream* profile_stream, NonnullOwnPtrVector<String>* profiler_strings, Vector<int>* profiler_string_id_map) void set_profiling_details(bool should_dump_profile, size_t instruction_interval, OutputFileStream* profile_stream, NonnullOwnPtrVector<String>* profiler_strings, Vector<int>* profiler_string_id_map)
{ {
@ -113,7 +113,7 @@ public:
private: private:
const String m_executable_path; const String m_executable_path;
const Vector<String> m_arguments; const Vector<StringView> m_arguments;
const Vector<String> m_environment; const Vector<String> m_environment;
SoftMMU m_mmu; SoftMMU m_mmu;

2
Userland/DevTools/UserspaceEmulator/main.cpp
View file

@ -21,7 +21,7 @@ bool g_report_to_debug = false;
int main(int argc, char** argv, char** env) int main(int argc, char** argv, char** env)
{ {
Vector<String> arguments; Vector<StringView> arguments;
bool pause_on_startup { false }; bool pause_on_startup { false };
String profile_dump_path; String profile_dump_path;
FILE* profile_output_file { nullptr }; FILE* profile_output_file { nullptr };