RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 10:28:10 +00:00
Code Issues Activity Actions

UserspaceEmulator: Load the target executable ELF semi-properly :^)

Browse source 
This patch adds a basic ELF program loader to the UserspaceEmulator and
creates MMU regions for each PT_LOAD header. (Note that we don't yet
respect the R/W/X flags etc.)

We also turn the SoftCPU into an X86::InstructionStream and give it an
EIP register so we can actually execute code by fetching memory through
our MMU abstraction.
This commit is contained in:
Andreas Kling 2020-07-11 16:45:48 +02:00
parent 0eab5659f8
commit ae1d14bc7a
5 changed files with 68 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
DevTools/UserspaceEmulator/SoftCPU.cpp
View file

@ -78,9 +78,30 @@ void SoftCPU::dump() const
printf("o=%u s=%u z=%u a=%u p=%u c=%u\n", of(), sf(), zf(), af(), pf(), cf());
}
u8 SoftCPU::read8()
{
auto value = read_memory8({ cs(), eip() });
m_eip += 1;
return value;
}
u16 SoftCPU::read16()
{
auto value = read_memory16({ cs(), eip() });
m_eip += 2;
return value;
}
u32 SoftCPU::read32()
{
auto value = read_memory32({ cs(), eip() });
m_eip += 4;
return value;
}
u8 SoftCPU::read_memory8(X86::LogicalAddress address)
{
ASSERT(address.selector() == 0x20);
ASSERT(address.selector() == 0x18 || address.selector() == 0x20);
auto value = m_emulator.mmu().read8(address.offset());
printf("\033[36;1mread_memory8: @%08x -> %02x\033[0m\n", address.offset(), value);
return value;
@ -88,7 +109,7 @@ u8 SoftCPU::read_memory8(X86::LogicalAddress address)
u16 SoftCPU::read_memory16(X86::LogicalAddress address)
{
ASSERT(address.selector() == 0x20);
ASSERT(address.selector() == 0x18 || address.selector() == 0x20);
auto value = m_emulator.mmu().read16(address.offset());
printf("\033[36;1mread_memory16: @%08x -> %04x\033[0m\n", address.offset(), value);
return value;
@ -96,7 +117,7 @@ u16 SoftCPU::read_memory16(X86::LogicalAddress address)
u32 SoftCPU::read_memory32(X86::LogicalAddress address)
{
ASSERT(address.selector() == 0x20);
ASSERT(address.selector() == 0x18 || address.selector() == 0x20);
auto value = m_emulator.mmu().read32(address.offset());
printf("\033[36;1mread_memory32: @%08x -> %08x\033[0m\n", address.offset(), value);
return value;