diff options
author | Andreas Kling <kling@serenityos.org> | 2020-07-12 00:54:09 +0200 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2020-07-12 01:36:45 +0200 |
commit | 734f63d522e8cefc9c2f919f90dab733a0e171d7 (patch) | |
tree | 760036661a8955565d7aaf4a58c432796c103628 /DevTools/UserspaceEmulator/SoftMMU.cpp | |
parent | df95e25eaa618ae83d0ff0c3d6a2d6a22821f5ec (diff) | |
download | serenity-734f63d522e8cefc9c2f919f90dab733a0e171d7.zip |
UserspaceEmulator: Add basic TLS (thread-local storage) support
The SoftMMU now receives full X86::LogicalAddress values from SoftCPU.
This allows the MMU to reroute TLS accesses to a special memory region.
The ELF executable's PT_TLS header tells us how to allocate the TLS.
Basically, the GS register points to a magical 4-byte area which has
a pointer to the TCB (thread control block). The TCB lives in normal
flat memory space and is accessed through the DS register.
Diffstat (limited to 'DevTools/UserspaceEmulator/SoftMMU.cpp')
-rw-r--r-- | DevTools/UserspaceEmulator/SoftMMU.cpp | 51 |
1 files changed, 30 insertions, 21 deletions
diff --git a/DevTools/UserspaceEmulator/SoftMMU.cpp b/DevTools/UserspaceEmulator/SoftMMU.cpp index cc3174a3e2..cf4d95cf25 100644 --- a/DevTools/UserspaceEmulator/SoftMMU.cpp +++ b/DevTools/UserspaceEmulator/SoftMMU.cpp @@ -28,10 +28,13 @@ namespace UserspaceEmulator { -SoftMMU::Region* SoftMMU::find_region(u32 address) +SoftMMU::Region* SoftMMU::find_region(X86::LogicalAddress address) { + if (address.selector() == 0x28) + return m_tls_region.ptr(); + for (auto& region : m_regions) { - if (region.contains(address)) + if (region.contains(address.offset())) return ®ion; } return nullptr; @@ -39,75 +42,81 @@ SoftMMU::Region* SoftMMU::find_region(u32 address) void SoftMMU::add_region(NonnullOwnPtr<Region> region) { - ASSERT(!find_region(region->base())); + ASSERT(!find_region({ 0x20, region->base() })); // FIXME: More sanity checks pls m_regions.append(move(region)); } -u8 SoftMMU::read8(u32 address) +void SoftMMU::set_tls_region(NonnullOwnPtr<Region> region) +{ + ASSERT(!m_tls_region); + m_tls_region = move(region); +} + +u8 SoftMMU::read8(X86::LogicalAddress address) { auto* region = find_region(address); if (!region) { - warn() << "SoftMMU::read8: No region for @" << (const void*)address; + warn() << "SoftMMU::read8: No region for @" << (const void*)address.offset(); TODO(); } - return region->read8(address - region->base()); + return region->read8(address.offset() - region->base()); } -u16 SoftMMU::read16(u32 address) +u16 SoftMMU::read16(X86::LogicalAddress address) { auto* region = find_region(address); if (!region) { - warn() << "SoftMMU::read16: No region for @" << (const void*)address; + warn() << "SoftMMU::read16: No region for @" << (const void*)address.offset(); TODO(); } - return region->read16(address - region->base()); + return region->read16(address.offset() - region->base()); } -u32 SoftMMU::read32(u32 address) +u32 SoftMMU::read32(X86::LogicalAddress address) { auto* region = find_region(address); if (!region) { - warn() << "SoftMMU::read32: No region for @" << (const void*)address; + warn() << "SoftMMU::read32: No region for @" << (const void*)address.offset(); TODO(); } - return region->read32(address - region->base()); + return region->read32(address.offset() - region->base()); } -void SoftMMU::write8(u32 address, u8 value) +void SoftMMU::write8(X86::LogicalAddress address, u8 value) { auto* region = find_region(address); if (!region) { - warn() << "SoftMMU::write8: No region for @" << (const void*)address; + warn() << "SoftMMU::write8: No region for @" << (const void*)address.offset(); TODO(); } - region->write8(address - region->base(), value); + region->write8(address.offset() - region->base(), value); } -void SoftMMU::write16(u32 address, u16 value) +void SoftMMU::write16(X86::LogicalAddress address, u16 value) { auto* region = find_region(address); if (!region) { - warn() << "SoftMMU::write16: No region for @" << (const void*)address; + warn() << "SoftMMU::write16: No region for @" << (const void*)address.offset(); TODO(); } - region->write16(address - region->base(), value); + region->write16(address.offset() - region->base(), value); } -void SoftMMU::write32(u32 address, u32 value) +void SoftMMU::write32(X86::LogicalAddress address, u32 value) { auto* region = find_region(address); if (!region) { - warn() << "SoftMMU::write32: No region for @" << (const void*)address; + warn() << "SoftMMU::write32: No region for @" << (const void*)address.offset(); TODO(); } - region->write32(address - region->base(), value); + region->write32(address.offset() - region->base(), value); } } |