commit 05544f327a0239376b737f17192bfb426ad79d65
author Roman Kiryanov <rkir@google.com> Wed Jun 19 13:40:45 2019 -0700
committer Roman Kiryanov <rkir@google.com> Wed Jun 19 13:42:22 2019 -0700
tree f386ba09f51fbabee3844a507cc6c9a584fcdd60
parent 3a1626ac0622150d7cc593e9318106611a3ed904

Fix hostMalloc and guestPtr in goldfish-address-space on host

Bug: 128324105
Test: emugl_combined_unittests
Change-Id: Id243729ee8b70b7e82bfd4609aabd5f4bdc2e674
Signed-off-by: Roman Kiryanov <rkir@google.com>

shared/OpenglCodecCommon/goldfish_address_space_host.impl

diff --git a/shared/OpenglCodecCommon/goldfish_address_space_host.impl b/shared/OpenglCodecCommon/goldfish_address_space_host.impl
index db03d25..b09f418 100644
--- a/shared/OpenglCodecCommon/goldfish_address_space_host.impl
+++ b/shared/OpenglCodecCommon/goldfish_address_space_host.impl
@@ -130,7 +130,7 @@
 
 void *GoldfishAddressSpaceBlock::guestPtr() const
 {
-    return reinterpret_cast<char *>(m_mmaped_ptr) + (m_host_addr & (PAGE_SIZE - 1));
+    return HostAddressSpaceDevice::get()->getHostAddr(m_host_addr);
 }
 
 void GoldfishAddressSpaceBlock::destroy()
@@ -181,7 +181,7 @@
     request.metadata = HOST_MEMORY_ALLOCATOR_COMMAND_ALLOCATE_ID;
 
     HostAddressSpaceDevice::get()->ping(m_provider.m_handle, &request);
-    block->mmap(0);
+    block->mmap(block->physAddr());
 
     return 0;
 }