diff options
| author | Elliott Hughes <enh@google.com> | 2014-06-05 03:26:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-05 03:26:11 +0000 |
| commit | aa2be4fd691933524b91680cd7517a9334d9a2a7 (patch) | |
| tree | f46516691aa3ff37b84e4cef18e33ddd7c469b10 | |
| parent | 20df39a08981f6283359917382db4270ed3a4503 (diff) | |
| parent | f1d63bdf0059da2f80478ed61cd6064f806752b0 (diff) | |
| download | system_core-aa2be4fd691933524b91680cd7517a9334d9a2a7.zip system_core-aa2be4fd691933524b91680cd7517a9334d9a2a7.tar.gz system_core-aa2be4fd691933524b91680cd7517a9334d9a2a7.tar.bz2 | |
Merge "[MIPS64] Use generic cpu-independent libpixelflinger for mips64"
| -rw-r--r-- | libpixelflinger/scanline.cpp | 10 | ||||
| -rw-r--r-- | libpixelflinger/tests/codegen/codegen.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libpixelflinger/scanline.cpp b/libpixelflinger/scanline.cpp index f84a28a..26b9a3e 100644 --- a/libpixelflinger/scanline.cpp +++ b/libpixelflinger/scanline.cpp @@ -39,7 +39,7 @@ #include "codeflinger/ARMAssembler.h" #elif defined(__aarch64__) #include "codeflinger/Arm64Assembler.h" -#elif defined(__mips__) +#elif defined(__mips__) && !defined(__LP64__) #include "codeflinger/MIPSAssembler.h" #endif //#include "codeflinger/ARMAssemblerOptimizer.h" @@ -59,7 +59,7 @@ # define ANDROID_CODEGEN ANDROID_CODEGEN_GENERATED #endif -#if defined(__arm__) || defined(__mips__) || defined(__aarch64__) +#if defined(__arm__) || (defined(__mips__) && !defined(__LP64__)) || defined(__aarch64__) # define ANDROID_ARM_CODEGEN 1 #else # define ANDROID_ARM_CODEGEN 0 @@ -73,7 +73,7 @@ */ #define DEBUG_NEEDS 0 -#ifdef __mips__ +#if defined( __mips__) && !defined(__LP64__) #define ASSEMBLY_SCRATCH_SIZE 4096 #elif defined(__aarch64__) #define ASSEMBLY_SCRATCH_SIZE 8192 @@ -134,7 +134,7 @@ extern "C" void scanline_col32cb16blend_arm(uint16_t *dst, uint32_t col, size_t #elif defined(__aarch64__) extern "C" void scanline_t32cb16blend_arm64(uint16_t*, uint32_t*, size_t); extern "C" void scanline_col32cb16blend_arm64(uint16_t *dst, uint32_t col, size_t ct); -#elif defined(__mips__) +#elif defined(__mips__) && !defined(__LP64__) extern "C" void scanline_t32cb16blend_mips(uint16_t*, uint32_t*, size_t); #endif @@ -2175,7 +2175,7 @@ last_one: void scanline_t32cb16blend(context_t* c) { -#if ((ANDROID_CODEGEN >= ANDROID_CODEGEN_ASM) && (defined(__arm__) || defined(__mips__) || defined(__aarch64__))) +#if ((ANDROID_CODEGEN >= ANDROID_CODEGEN_ASM) && (defined(__arm__) || (defined(__mips__) && !defined(__LP64__)) || defined(__aarch64__))) int32_t x = c->iterators.xl; size_t ct = c->iterators.xr - x; int32_t y = c->iterators.y; diff --git a/libpixelflinger/tests/codegen/codegen.cpp b/libpixelflinger/tests/codegen/codegen.cpp index e9f6c61..46c1ccc 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) GGLAssembler assembler( new ARMAssembler(a) ); #endif -#if defined(__mips__) +#if defined(__mips__) && !defined(__LP64__) GGLAssembler assembler( new ArmToMipsAssembler(a) ); #endif |