diff --git a/Userland/DevTools/UserspaceEmulator/MmapRegion.cpp b/Userland/DevTools/UserspaceEmulator/MmapRegion.cpp index eff2431999..f5b145c8cf 100644 --- a/Userland/DevTools/UserspaceEmulator/MmapRegion.cpp +++ b/Userland/DevTools/UserspaceEmulator/MmapRegion.cpp @@ -27,7 +27,7 @@ static void free_pages(void* ptr, size_t bytes) NonnullOwnPtr MmapRegion::create_anonymous(u32 base, u32 size, u32 prot, String name) { - auto data = (u8*)mmap_initialized(size, 0, nullptr); + auto data = (u8*)mmap_initialized(size, 0, String::formatted("(UE) {}", name).characters()); auto shadow_data = (u8*)mmap_initialized(size, 1, "MmapRegion ShadowData"); auto region = adopt_own(*new MmapRegion(base, size, prot, data, shadow_data)); region->m_name = move(name); @@ -38,7 +38,7 @@ NonnullOwnPtr MmapRegion::create_file_backed(u32 base, u32 size, u32 { // Since we put the memory to an arbitrary location, do not pass MAP_FIXED to the Kernel. auto real_flags = flags & ~MAP_FIXED; - auto data = (u8*)mmap_with_name(nullptr, size, prot, real_flags, fd, offset, name.is_empty() ? nullptr : name.characters()); + auto data = (u8*)mmap_with_name(nullptr, size, prot, real_flags, fd, offset, name.is_empty() ? nullptr : String::formatted("(UE) {}", name).characters()); VERIFY(data != MAP_FAILED); auto shadow_data = (u8*)mmap_initialized(size, 1, "MmapRegion ShadowData"); auto region = adopt_own(*new MmapRegion(base, size, prot, data, shadow_data)); @@ -317,4 +317,10 @@ void MmapRegion::set_prot(int prot) } } +void MmapRegion::set_name(String name) +{ + m_name = move(name); + set_mmap_name(range().base().as_ptr(), range().size(), String::formatted("(UE) {}", m_name).characters()); +} + } diff --git a/Userland/DevTools/UserspaceEmulator/MmapRegion.h b/Userland/DevTools/UserspaceEmulator/MmapRegion.h index b39eaeee1b..82ee22a6aa 100644 --- a/Userland/DevTools/UserspaceEmulator/MmapRegion.h +++ b/Userland/DevTools/UserspaceEmulator/MmapRegion.h @@ -61,7 +61,7 @@ public: return {}; return m_name.substring(0, *maybe_separator); } - void set_name(String name) { m_name = move(name); } + void set_name(String name); private: MmapRegion(u32 base, u32 size, int prot, u8* data, u8* shadow_data);