diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-02-29 13:53:37 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-03-22 11:10:31 -0700 |
| commit | 8aafafe4bdf6c3e0873a0b0fa6787b573eac24ee (patch) | |
| tree | 9b9a94c7a1257828778b3782266d477dd7673459 /tools/emulator/opengl/shared/OpenglOsUtils/osThreadUnix.cpp | |
| parent | 89b7a104d41c1ecbc1319a3d47199d40d56ebc96 (diff) | |
Fixed crash and 64-bit porting issues
1. "emugen" generates four *dec.cpp files containing code like this
to decode offset to pointer in stream
tmp = *(T *)(ptr + 8 + 4 + 4 + 4 + *(size_t *)(ptr +8 + 4 + 4));
If *dec.cpp are compiled in 64-bit, size_t is 8-byte and dereferencing of
it is likley to get wild offset for dereferencing of *(T *) to crash the
code. Solution is to define tsize_t for "target size_t" instead
of using host size_t.
2. Cast pointer to "uintptr_t" instead of "unsigned int" for 2nd param of
ShareGroup::getGlobalName(NamedObjectType, ObjectLocalName/*64bit*/).
3. Instance of EGLSurface, EGLContext and EGLImageKHR are used as 32-bit
key for std::map< unsigned int, * > SurfacesHndlMap, ContextsHndlMap,
and ImagesHndlMap, respectively. Cast pointer to uintptr_t and assert
upper 32-bit is zero before passing to map::find().
4. Instance of GLeglImageOES is used to eglAttachEGLImage() which expect
"unsigned int". Cast it to uintptr_t and assert upper 32-bit is zero.
5. The 5th param to GLEScontext::setPointer is GLvoid* but contains 32-bit
offset to vbo if bufferName exists. Cast it to uintptr_t and assert
upper 32-bit is zero.
6. Use %zu instead of %d to print size_t
7. Cast pointer to (uintptr_t) in many other places
Change-Id: Iba6e5bda08c43376db5b011e9d781481ee1f5a12
Diffstat (limited to 'tools/emulator/opengl/shared/OpenglOsUtils/osThreadUnix.cpp')
| -rw-r--r-- | tools/emulator/opengl/shared/OpenglOsUtils/osThreadUnix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/emulator/opengl/shared/OpenglOsUtils/osThreadUnix.cpp b/tools/emulator/opengl/shared/OpenglOsUtils/osThreadUnix.cpp index 66611eee6..0fa7815e7 100644 --- a/tools/emulator/opengl/shared/OpenglOsUtils/osThreadUnix.cpp +++ b/tools/emulator/opengl/shared/OpenglOsUtils/osThreadUnix.cpp @@ -84,7 +84,7 @@ Thread::thread_main(void *p_arg) pthread_mutex_lock(&self->m_lock); self->m_isRunning = false; - self->m_exitStatus = (int)ret; + self->m_exitStatus = (int)(intptr_t)ret; pthread_mutex_unlock(&self->m_lock); return ret; |
