Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b34d5d52: Use the TLS register if HAVE_ARM_TLS_REGISTER is defined

Browse Source 
Merge commit 'b34d5d527596102ae7a040d787e4d8c336bf192b' into eclair-mr2

* commit 'b34d5d527596102ae7a040d787e4d8c336bf192b':
  Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
This commit is contained in:
Mathias Agopian
2009-10-19 16:27:37 -07:00
committed by Android Git Automerger
parent 60714539ad b34d5d5275
commit 992f4802ae
3 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opengl/libs/Android.mk
View File

@@ -32,6 +32,10 @@ ifeq ($(TARGET_BOARD_PLATFORM),msm7k)
LOCAL_CFLAGS += -DADRENO130=1 LOCAL_CFLAGS += -DADRENO130=1
endif endif
ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
endif
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
installed_libEGL := $(LOCAL_INSTALLED_MODULE) installed_libEGL := $(LOCAL_INSTALLED_MODULE)
@@ -78,6 +82,10 @@ LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv1\"
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
LOCAL_CFLAGS += -fvisibility=hidden LOCAL_CFLAGS += -fvisibility=hidden
ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
endif
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
@@ -107,4 +115,8 @@ LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv2\"
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
LOCAL_CFLAGS += -fvisibility=hidden LOCAL_CFLAGS += -fvisibility=hidden
ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
endif
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

14
opengl/libs/GLES2/gl2.cpp
View File

@@ -41,12 +41,20 @@ using namespace android;
#if USE_FAST_TLS_KEY #if USE_FAST_TLS_KEY
#ifdef HAVE_ARM_TLS_REGISTER
#define GET_TLS(reg) \
"mrc p15, 0, " #reg ", c13, c0, 3 \n"
#else
#define GET_TLS(reg) \
"mov " #reg ", #0xFFFF0FFF \n" \
"ldr " #reg ", [" #reg ", #-15] \n"
#endif
#define API_ENTRY(_api) __attribute__((naked)) _api #define API_ENTRY(_api) __attribute__((naked)) _api
#define CALL_GL_API(_api, ...) \ #define CALL_GL_API(_api, ...) \
asm volatile( \ asm volatile( \
"mov r12, #0xFFFF0FFF \n" \ GET_TLS(r12) \
"ldr r12, [r12, #-15] \n" \
"ldr r12, [r12, %[tls]] \n" \ "ldr r12, [r12, %[tls]] \n" \
"cmp r12, #0 \n" \ "cmp r12, #0 \n" \
"ldrne pc, [r12, %[api]] \n" \ "ldrne pc, [r12, %[api]] \n" \
@@ -56,7 +64,7 @@ using namespace android;
[api] "J"(__builtin_offsetof(gl_hooks_t, gl._api)) \ [api] "J"(__builtin_offsetof(gl_hooks_t, gl._api)) \
: \ : \
); );
#define CALL_GL_API_RETURN(_api, ...) \ #define CALL_GL_API_RETURN(_api, ...) \
CALL_GL_API(_api, __VA_ARGS__) \ CALL_GL_API(_api, __VA_ARGS__) \
return 0; // placate gcc's warnings. never reached. return 0; // placate gcc's warnings. never reached.

14
opengl/libs/GLES_CM/gl.cpp
View File

@@ -76,12 +76,20 @@ void glVertexPointerBounds(GLint size, GLenum type,
#if USE_FAST_TLS_KEY && !CHECK_FOR_GL_ERRORS #if USE_FAST_TLS_KEY && !CHECK_FOR_GL_ERRORS
#ifdef HAVE_ARM_TLS_REGISTER
#define GET_TLS(reg) \
"mrc p15, 0, " #reg ", c13, c0, 3 \n"
#else
#define GET_TLS(reg) \
"mov " #reg ", #0xFFFF0FFF \n" \
"ldr " #reg ", [" #reg ", #-15] \n"
#endif
#define API_ENTRY(_api) __attribute__((naked)) _api #define API_ENTRY(_api) __attribute__((naked)) _api
#define CALL_GL_API(_api, ...) \ #define CALL_GL_API(_api, ...) \
asm volatile( \ asm volatile( \
"mov r12, #0xFFFF0FFF \n" \ GET_TLS(r12) \
"ldr r12, [r12, #-15] \n" \
"ldr r12, [r12, %[tls]] \n" \ "ldr r12, [r12, %[tls]] \n" \
"cmp r12, #0 \n" \ "cmp r12, #0 \n" \
"ldrne pc, [r12, %[api]] \n" \ "ldrne pc, [r12, %[api]] \n" \
@@ -91,7 +99,7 @@ void glVertexPointerBounds(GLint size, GLenum type,
[api] "J"(__builtin_offsetof(gl_hooks_t, gl._api)) \ [api] "J"(__builtin_offsetof(gl_hooks_t, gl._api)) \
: \ : \
); );
#define CALL_GL_API_RETURN(_api, ...) \ #define CALL_GL_API_RETURN(_api, ...) \
CALL_GL_API(_api, __VA_ARGS__) \ CALL_GL_API(_api, __VA_ARGS__) \
return 0; // placate gcc's warnings. never reached. return 0; // placate gcc's warnings. never reached.