diff options
author | Andreas Kling <kling@serenityos.org> | 2020-12-25 14:48:30 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2020-12-25 14:48:30 +0100 |
commit | 40e9edd79811c7cf23aafbf8b1a85db3355a3176 (patch) | |
tree | dae72747fbf14f7d400e099732a66f695296ee95 /DevTools/UserspaceEmulator/Emulator.cpp | |
parent | 6c9a6bea1ec050d37280c32e3a8521f215a4d46e (diff) | |
download | serenity-40e9edd79811c7cf23aafbf8b1a85db3355a3176.zip |
LibELF: Move AuxiliaryValue into the ELF namespace
Diffstat (limited to 'DevTools/UserspaceEmulator/Emulator.cpp')
-rw-r--r-- | DevTools/UserspaceEmulator/Emulator.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/DevTools/UserspaceEmulator/Emulator.cpp b/DevTools/UserspaceEmulator/Emulator.cpp index 7364c8cf9c..d09f71a21b 100644 --- a/DevTools/UserspaceEmulator/Emulator.cpp +++ b/DevTools/UserspaceEmulator/Emulator.cpp @@ -89,30 +89,30 @@ Emulator::Emulator(const String& executable_path, const Vector<String>& argument setup_signal_trampoline(); } -Vector<AuxiliaryValue> Emulator::generate_auxiliary_vector(FlatPtr load_base, FlatPtr entry_eip, String executable_path, int executable_fd) const +Vector<ELF::AuxiliaryValue> Emulator::generate_auxiliary_vector(FlatPtr load_base, FlatPtr entry_eip, String executable_path, int executable_fd) const { // FIXME: This is not fully compatible with the auxiliary vector the kernel generates, this is just the bare // minimum to get the loader going. - Vector<AuxiliaryValue> auxv; + Vector<ELF::AuxiliaryValue> auxv; // PHDR/EXECFD // PH* - auxv.append({ AuxiliaryValue::PageSize, PAGE_SIZE }); - auxv.append({ AuxiliaryValue::BaseAddress, (void*)load_base }); + auxv.append({ ELF::AuxiliaryValue::PageSize, PAGE_SIZE }); + auxv.append({ ELF::AuxiliaryValue::BaseAddress, (void*)load_base }); - auxv.append({ AuxiliaryValue::Entry, (void*)entry_eip }); + auxv.append({ ELF::AuxiliaryValue::Entry, (void*)entry_eip }); // FIXME: Don't hard code this? We might support other platforms later.. (e.g. x86_64) - auxv.append({ AuxiliaryValue::Platform, "i386" }); + auxv.append({ ELF::AuxiliaryValue::Platform, "i386" }); - auxv.append({ AuxiliaryValue::ExecFilename, executable_path }); + auxv.append({ ELF::AuxiliaryValue::ExecFilename, executable_path }); - auxv.append({ AuxiliaryValue::ExecFileDescriptor, executable_fd }); + auxv.append({ ELF::AuxiliaryValue::ExecFileDescriptor, executable_fd }); - auxv.append({ AuxiliaryValue::Null, 0L }); + auxv.append({ ELF::AuxiliaryValue::Null, 0L }); return auxv; } -void Emulator::setup_stack(Vector<AuxiliaryValue> aux_vector) +void Emulator::setup_stack(Vector<ELF::AuxiliaryValue> aux_vector) { auto stack_region = make<SimpleRegion>(stack_location, stack_size); stack_region->set_stack(true); |