commit 240a6c96eb94734a84eed53349fb0928d3ce6d19
author Tim Murray <timmurray@google.com> Mon Sep 08 15:51:22 2014 -0700
committer Tim Murray <timmurray@google.com> Mon Sep 08 15:56:04 2014 -0700
tree 4578d5d9ae8364fcb12a91910b2eb243212b4352
parent c8c7befb7d1be0c84ab3e26eab9ed0839de45dfc

Fix x86 calling convention issue.

bug 17398497

Change-Id: I4ef4e55f9b948b234b782a340178d4e57e76274f

driver/rsdRuntimeStubs.cpp

diff --git a/driver/rsdRuntimeStubs.cpp b/driver/rsdRuntimeStubs.cpp
index 7c61503..7456d2f 100644
--- a/driver/rsdRuntimeStubs.cpp
+++ b/driver/rsdRuntimeStubs.cpp
@@ -518,9 +518,22 @@
 }
 #endif
 
-// this may need to change for other CPU architectures
+
 #ifndef RS_COMPATIBILITY_LIB
 #ifndef __LP64__
+
+// i386 has different struct return passing to ARM; emulate with void*
+#ifdef __i386__
+static const void* SC_GetAllocation(const void *ptr) {
+    Context *rsc = RsdCpuReference::getTlsContext();
+    const Script *sc = RsdCpuReference::getTlsScript();
+    Allocation* alloc = rsdScriptGetAllocationForPointer(rsc, sc, ptr);
+    android::renderscript::rs_allocation obj = {0};
+    alloc->callUpdateCacheObject(rsc, &obj);
+    return (void*)obj.p;
+}
+#else
+// ARMv7/MIPS
 static const android::renderscript::rs_allocation SC_GetAllocation(const void *ptr) {
     Context *rsc = RsdCpuReference::getTlsContext();
     const Script *sc = RsdCpuReference::getTlsScript();
@@ -529,7 +542,9 @@
     alloc->callUpdateCacheObject(rsc, &obj);
     return obj;
 }
+#endif
 #else
+// AArch64/x86_64/MIPS64
 static const android::renderscript::rs_allocation SC_GetAllocation(const void *ptr) {
     Context *rsc = RsdCpuReference::getTlsContext();
     const Script *sc = RsdCpuReference::getTlsScript();