ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "[MIPS64] Use generic cpu-independent libpixelflinger for mips64"

Browse source
This commit is contained in:
Elliott Hughes 2014-06-05 03:26:11 +00:00 • committed by Gerrit Code Review
commit aa2be4fd69
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libpixelflinger/scanline.cpp
View file

@ -39,7 +39,7 @@
#include "codeflinger/ARMAssembler.h" #include "codeflinger/ARMAssembler.h"
#elif defined(__aarch64__) #elif defined(__aarch64__)
#include "codeflinger/Arm64Assembler.h" #include "codeflinger/Arm64Assembler.h"
#elif defined(__mips__) #elif defined(__mips__) && !defined(__LP64__)
#include "codeflinger/MIPSAssembler.h" #include "codeflinger/MIPSAssembler.h"
#endif #endif
//#include "codeflinger/ARMAssemblerOptimizer.h" //#include "codeflinger/ARMAssemblerOptimizer.h"
@ -59,7 +59,7 @@
# define ANDROID_CODEGEN ANDROID_CODEGEN_GENERATED # define ANDROID_CODEGEN ANDROID_CODEGEN_GENERATED
#endif #endif
#if defined(__arm__) || defined(__mips__) || defined(__aarch64__) #if defined(__arm__) || (defined(__mips__) && !defined(__LP64__)) || defined(__aarch64__)
# define ANDROID_ARM_CODEGEN 1 # define ANDROID_ARM_CODEGEN 1
#else #else
# define ANDROID_ARM_CODEGEN 0 # define ANDROID_ARM_CODEGEN 0
@ -73,7 +73,7 @@
*/ */
#define DEBUG_NEEDS 0 #define DEBUG_NEEDS 0
#ifdef __mips__ #if defined( __mips__) && !defined(__LP64__)
#define ASSEMBLY_SCRATCH_SIZE 4096 #define ASSEMBLY_SCRATCH_SIZE 4096
#elif defined(__aarch64__) #elif defined(__aarch64__)
#define ASSEMBLY_SCRATCH_SIZE 8192 #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__) #elif defined(__aarch64__)
extern "C" void scanline_t32cb16blend_arm64(uint16_t*, uint32_t*, size_t); 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); 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); extern "C" void scanline_t32cb16blend_mips(uint16_t*, uint32_t*, size_t);
#endif #endif
@ -2175,7 +2175,7 @@ last_one:
void scanline_t32cb16blend(context_t* c) 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; int32_t x = c->iterators.xl;
size_t ct = c->iterators.xr - x; size_t ct = c->iterators.xr - x;
int32_t y = c->iterators.y; int32_t y = c->iterators.y;

2
libpixelflinger/tests/codegen/codegen.cpp
View file

@ -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) ); GGLAssembler assembler( new ARMAssembler(a) );
#endif #endif
#if defined(__mips__) #if defined(__mips__) && !defined(__LP64__)
GGLAssembler assembler( new ArmToMipsAssembler(a) ); GGLAssembler assembler( new ArmToMipsAssembler(a) );
#endif #endif