summaryrefslogtreecommitdiffstats
path: root/libpixelflinger
diff options
context:
space:
mode:
authorLjubomir Papuga <ljubomir.papuga@imgtec.com>2015-12-15 15:23:01 +0100
committerLjubomir Papuga <ljubomir.papuga@imgtec.com>2015-12-15 15:23:01 +0100
commite0c9f2bc5a6ab19fa6e457a30a0f1231e09b0afb (patch)
tree41c19a139b1b0c6c1d3f586764a9309d470428b9 /libpixelflinger
parent461a29540c01b44f07fc26ccb0d5bc7d0d92a974 (diff)
downloadsystem_core-e0c9f2bc5a6ab19fa6e457a30a0f1231e09b0afb.tar.gz
system_core-e0c9f2bc5a6ab19fa6e457a30a0f1231e09b0afb.tar.bz2
system_core-e0c9f2bc5a6ab19fa6e457a30a0f1231e09b0afb.zip
libpixelflinger: MIPS64 assembler test bug fix
Change-Id: I47f77790baabea85ee318976a2c44ab1c0c0b9cb
Diffstat (limited to 'libpixelflinger')
-rw-r--r--libpixelflinger/codeflinger/MIPS64Assembler.cpp3
-rw-r--r--libpixelflinger/codeflinger/MIPSAssembler.cpp6
-rw-r--r--libpixelflinger/codeflinger/MIPSAssembler.h1
3 files changed, 8 insertions, 2 deletions
diff --git a/libpixelflinger/codeflinger/MIPS64Assembler.cpp b/libpixelflinger/codeflinger/MIPS64Assembler.cpp
index a5305cca2..672040bc9 100644
--- a/libpixelflinger/codeflinger/MIPS64Assembler.cpp
+++ b/libpixelflinger/codeflinger/MIPS64Assembler.cpp
@@ -1304,9 +1304,8 @@ MIPS64Assembler::MIPS64Assembler(const sp<Assembly>& assembly, ArmToMips64Assemb
MIPS64Assembler::MIPS64Assembler(void* assembly, ArmToMips64Assembler *parent)
: mParent(parent),
- MIPSAssembler::MIPSAssembler(NULL, NULL)
+ MIPSAssembler::MIPSAssembler(assembly)
{
- mBase = mPC = (uint32_t *)assembly;
}
MIPS64Assembler::~MIPS64Assembler()
diff --git a/libpixelflinger/codeflinger/MIPSAssembler.cpp b/libpixelflinger/codeflinger/MIPSAssembler.cpp
index daa231fe0..5497faeb0 100644
--- a/libpixelflinger/codeflinger/MIPSAssembler.cpp
+++ b/libpixelflinger/codeflinger/MIPSAssembler.cpp
@@ -1256,6 +1256,12 @@ MIPSAssembler::MIPSAssembler(const sp<Assembly>& assembly, ArmToMipsAssembler *p
mDuration = ggl_system_time();
}
+MIPSAssembler::MIPSAssembler(void* assembly)
+ : mParent(NULL), mAssembly(NULL)
+{
+ mBase = mPC = (uint32_t *)assembly;
+}
+
MIPSAssembler::~MIPSAssembler()
{
}
diff --git a/libpixelflinger/codeflinger/MIPSAssembler.h b/libpixelflinger/codeflinger/MIPSAssembler.h
index 06cb0d0df..b53fefb34 100644
--- a/libpixelflinger/codeflinger/MIPSAssembler.h
+++ b/libpixelflinger/codeflinger/MIPSAssembler.h
@@ -242,6 +242,7 @@ class MIPSAssembler
{
public:
MIPSAssembler(const sp<Assembly>& assembly, ArmToMipsAssembler *parent);
+ MIPSAssembler(void* assembly);
virtual ~MIPSAssembler();
virtual uint32_t* base() const;