diff options
Diffstat (limited to 'libpixelflinger/codeflinger')
-rw-r--r-- | libpixelflinger/codeflinger/ARMAssembler.cpp | 11 | ||||
-rw-r--r-- | libpixelflinger/codeflinger/Arm64Assembler.cpp | 3 | ||||
-rw-r--r-- | libpixelflinger/codeflinger/MIPSAssembler.cpp | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/libpixelflinger/codeflinger/ARMAssembler.cpp b/libpixelflinger/codeflinger/ARMAssembler.cpp index ac009a9be..f47b6e42a 100644 --- a/libpixelflinger/codeflinger/ARMAssembler.cpp +++ b/libpixelflinger/codeflinger/ARMAssembler.cpp @@ -171,7 +171,7 @@ int ARMAssembler::generate(const char* name) } mAssembly->resize( int(pc()-base())*4 ); - + // the instruction cache is flushed by CodeCache const int64_t duration = ggl_system_time() - mDuration; const char * const format = "generated %s (%d ins) at [%p:%p] in %lld ns\n"; @@ -183,8 +183,8 @@ int ARMAssembler::generate(const char* name) printf(format, name, int(pc()-base()), base(), pc(), duration); disassemble(name); } - - return NO_ERROR; + + return OK; } uint32_t* ARMAssembler::pcForLabel(const char* label) @@ -213,14 +213,14 @@ void ARMAssembler::dataProcessing(int opcode, int cc, // multiply... void ARMAssembler::MLA(int cc, int s, int Rd, int Rm, int Rs, int Rn) { - if (Rd == Rm) { int t = Rm; Rm=Rs; Rs=t; } + if (Rd == Rm) { int t = Rm; Rm=Rs; Rs=t; } LOG_FATAL_IF(Rd==Rm, "MLA(r%u,r%u,r%u,r%u)", Rd,Rm,Rs,Rn); *mPC++ = (cc<<28) | (1<<21) | (s<<20) | (Rd<<16) | (Rn<<12) | (Rs<<8) | 0x90 | Rm; } void ARMAssembler::MUL(int cc, int s, int Rd, int Rm, int Rs) { - if (Rd == Rm) { int t = Rm; Rm=Rs; Rs=t; } + if (Rd == Rm) { int t = Rm; Rm=Rs; Rs=t; } LOG_FATAL_IF(Rd==Rm, "MUL(r%u,r%u,r%u)", Rd,Rm,Rs); *mPC++ = (cc<<28) | (s<<20) | (Rd<<16) | (Rs<<8) | 0x90 | Rm; } @@ -577,4 +577,3 @@ uint32_t ARMAssembler::reg_post(int Rm) } }; // namespace android - diff --git a/libpixelflinger/codeflinger/Arm64Assembler.cpp b/libpixelflinger/codeflinger/Arm64Assembler.cpp index aebc129bf..8926776d4 100644 --- a/libpixelflinger/codeflinger/Arm64Assembler.cpp +++ b/libpixelflinger/codeflinger/Arm64Assembler.cpp @@ -325,7 +325,7 @@ int ArmToArm64Assembler::generate(const char* name) printf(format, name, int(pc()-base()), base(), pc(), duration); disassemble(name); } - return NO_ERROR; + return OK; } uint32_t* ArmToArm64Assembler::pcForLabel(const char* label) @@ -1238,4 +1238,3 @@ uint32_t ArmToArm64Assembler::A64_EXTR_W(uint32_t Rd, uint32_t Rn, } }; // namespace android - diff --git a/libpixelflinger/codeflinger/MIPSAssembler.cpp b/libpixelflinger/codeflinger/MIPSAssembler.cpp index 039a72504..7de8cc11e 100644 --- a/libpixelflinger/codeflinger/MIPSAssembler.cpp +++ b/libpixelflinger/codeflinger/MIPSAssembler.cpp @@ -1421,7 +1421,7 @@ int MIPSAssembler::generate(const char* name) disassemble(name); } - return NO_ERROR; + return OK; } uint32_t* MIPSAssembler::pcForLabel(const char* label) @@ -1953,5 +1953,3 @@ void MIPSAssembler::UNIMPL(void) }; // namespace android: - - |