summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuane Sand2014-05-22 19:56:16 -0500
committerDuane Sand2014-06-03 18:53:12 -0500
commitf1d63bdf0059da2f80478ed61cd6064f806752b0 (patch)
tree31df31f0ada53f569e719c5a1a09d2774e3f9fef /libpixelflinger
parent4e26c95a6363da4885bb9178c9d42c273b357043 (diff)
downloadplatform-system-core-f1d63bdf0059da2f80478ed61cd6064f806752b0.tar.gz
platform-system-core-f1d63bdf0059da2f80478ed61cd6064f806752b0.tar.xz
platform-system-core-f1d63bdf0059da2f80478ed61cd6064f806752b0.zip
[MIPS64] Use generic cpu-independent libpixelflinger for mips64
For now, use generic C code instead of generated mips instructions, in the same manner as used on x86 and x86_64 targets. Change-Id: If3607484e0a446a755c62c030b3069d46ab5beb2
Diffstat (limited to 'libpixelflinger')
-rw-r--r--libpixelflinger/scanline.cpp10
-rw-r--r--libpixelflinger/tests/codegen/codegen.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/libpixelflinger/scanline.cpp b/libpixelflinger/scanline.cpp
index f84a28a81..26b9a3e45 100644
--- a/libpixelflinger/scanline.cpp
+++ b/libpixelflinger/scanline.cpp
@@ -39,7 +39,7 @@
39#include "codeflinger/ARMAssembler.h" 39#include "codeflinger/ARMAssembler.h"
40#elif defined(__aarch64__) 40#elif defined(__aarch64__)
41#include "codeflinger/Arm64Assembler.h" 41#include "codeflinger/Arm64Assembler.h"
42#elif defined(__mips__) 42#elif defined(__mips__) && !defined(__LP64__)
43#include "codeflinger/MIPSAssembler.h" 43#include "codeflinger/MIPSAssembler.h"
44#endif 44#endif
45//#include "codeflinger/ARMAssemblerOptimizer.h" 45//#include "codeflinger/ARMAssemblerOptimizer.h"
@@ -59,7 +59,7 @@
59# define ANDROID_CODEGEN ANDROID_CODEGEN_GENERATED 59# define ANDROID_CODEGEN ANDROID_CODEGEN_GENERATED
60#endif 60#endif
61 61
62#if defined(__arm__) || defined(__mips__) || defined(__aarch64__) 62#if defined(__arm__) || (defined(__mips__) && !defined(__LP64__)) || defined(__aarch64__)
63# define ANDROID_ARM_CODEGEN 1 63# define ANDROID_ARM_CODEGEN 1
64#else 64#else
65# define ANDROID_ARM_CODEGEN 0 65# define ANDROID_ARM_CODEGEN 0
@@ -73,7 +73,7 @@
73 */ 73 */
74#define DEBUG_NEEDS 0 74#define DEBUG_NEEDS 0
75 75
76#ifdef __mips__ 76#if defined( __mips__) && !defined(__LP64__)
77#define ASSEMBLY_SCRATCH_SIZE 4096 77#define ASSEMBLY_SCRATCH_SIZE 4096
78#elif defined(__aarch64__) 78#elif defined(__aarch64__)
79#define ASSEMBLY_SCRATCH_SIZE 8192 79#define ASSEMBLY_SCRATCH_SIZE 8192
@@ -134,7 +134,7 @@ extern "C" void scanline_col32cb16blend_arm(uint16_t *dst, uint32_t col, size_t
134#elif defined(__aarch64__) 134#elif defined(__aarch64__)
135extern "C" void scanline_t32cb16blend_arm64(uint16_t*, uint32_t*, size_t); 135extern "C" void scanline_t32cb16blend_arm64(uint16_t*, uint32_t*, size_t);
136extern "C" void scanline_col32cb16blend_arm64(uint16_t *dst, uint32_t col, size_t ct); 136extern "C" void scanline_col32cb16blend_arm64(uint16_t *dst, uint32_t col, size_t ct);
137#elif defined(__mips__) 137#elif defined(__mips__) && !defined(__LP64__)
138extern "C" void scanline_t32cb16blend_mips(uint16_t*, uint32_t*, size_t); 138extern "C" void scanline_t32cb16blend_mips(uint16_t*, uint32_t*, size_t);
139#endif 139#endif
140 140
@@ -2175,7 +2175,7 @@ last_one:
2175 2175
2176void scanline_t32cb16blend(context_t* c) 2176void scanline_t32cb16blend(context_t* c)
2177{ 2177{
2178#if ((ANDROID_CODEGEN >= ANDROID_CODEGEN_ASM) && (defined(__arm__) || defined(__mips__) || defined(__aarch64__))) 2178#if ((ANDROID_CODEGEN >= ANDROID_CODEGEN_ASM) && (defined(__arm__) || (defined(__mips__) && !defined(__LP64__)) || defined(__aarch64__)))
2179 int32_t x = c->iterators.xl; 2179 int32_t x = c->iterators.xl;
2180 size_t ct = c->iterators.xr - x; 2180 size_t ct = c->iterators.xr - x;
2181 int32_t y = c->iterators.y; 2181 int32_t y = c->iterators.y;
diff --git a/libpixelflinger/tests/codegen/codegen.cpp b/libpixelflinger/tests/codegen/codegen.cpp
index e9f6c61d8..46c1cccaf 100644
--- a/libpixelflinger/tests/codegen/codegen.cpp
+++ b/libpixelflinger/tests/codegen/codegen.cpp
@@ -52,7 +52,7 @@ static void ggl_test_codegen(uint32_t n, uint32_t p, uint32_t t0, uint32_t t1)
52 GGLAssembler assembler( new ARMAssembler(a) ); 52 GGLAssembler assembler( new ARMAssembler(a) );
53#endif 53#endif
54 54
55#if defined(__mips__) 55#if defined(__mips__) && !defined(__LP64__)
56 GGLAssembler assembler( new ArmToMipsAssembler(a) ); 56 GGLAssembler assembler( new ArmToMipsAssembler(a) );
57#endif 57#endif
58 58