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

Merge "libpixelflinger: MIPS64 assembler test bug fix"

Browse source
This commit is contained in:
Elliott Hughes 2015-12-16 18:23:49 +00:00 • committed by Gerrit Code Review
commit f8d892c84a
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libpixelflinger/codeflinger/MIPS64Assembler.cpp
View file

@ -1304,9 +1304,8 @@ MIPS64Assembler::MIPS64Assembler(const sp<Assembly>& assembly, ArmToMips64Assemb
MIPS64Assembler::MIPS64Assembler(void* assembly, ArmToMips64Assembler *parent) MIPS64Assembler::MIPS64Assembler(void* assembly, ArmToMips64Assembler *parent)
: mParent(parent), : mParent(parent),
MIPSAssembler::MIPSAssembler(NULL, NULL) MIPSAssembler::MIPSAssembler(assembly)
{ {
mBase = mPC = (uint32_t *)assembly;
} }
MIPS64Assembler::~MIPS64Assembler() MIPS64Assembler::~MIPS64Assembler()

6
libpixelflinger/codeflinger/MIPSAssembler.cpp
View file

@ -1256,6 +1256,12 @@ MIPSAssembler::MIPSAssembler(const sp<Assembly>& assembly, ArmToMipsAssembler *p
mDuration = ggl_system_time(); mDuration = ggl_system_time();
} }
MIPSAssembler::MIPSAssembler(void* assembly)
: mParent(NULL), mAssembly(NULL)
{
mBase = mPC = (uint32_t *)assembly;
}
MIPSAssembler::~MIPSAssembler() MIPSAssembler::~MIPSAssembler()
{ {
} }

1
libpixelflinger/codeflinger/MIPSAssembler.h
View file

@ -242,6 +242,7 @@ class MIPSAssembler
{ {
public: public:
MIPSAssembler(const sp<Assembly>& assembly, ArmToMipsAssembler *parent); MIPSAssembler(const sp<Assembly>& assembly, ArmToMipsAssembler *parent);
MIPSAssembler(void* assembly);
virtual ~MIPSAssembler(); virtual ~MIPSAssembler();
virtual uint32_t* base() const; virtual uint32_t* base() const;