summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLjubomir Papuga2015-12-15 08:23:01 -0600
committerLjubomir Papuga2015-12-15 08:23:01 -0600
commite0c9f2bc5a6ab19fa6e457a30a0f1231e09b0afb (patch)
tree41c19a139b1b0c6c1d3f586764a9309d470428b9 /libpixelflinger
parent461a29540c01b44f07fc26ccb0d5bc7d0d92a974 (diff)
downloadplatform-system-core-e0c9f2bc5a6ab19fa6e457a30a0f1231e09b0afb.tar.gz
platform-system-core-e0c9f2bc5a6ab19fa6e457a30a0f1231e09b0afb.tar.xz
platform-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
1304 1304
1305MIPS64Assembler::MIPS64Assembler(void* assembly, ArmToMips64Assembler *parent) 1305MIPS64Assembler::MIPS64Assembler(void* assembly, ArmToMips64Assembler *parent)
1306 : mParent(parent), 1306 : mParent(parent),
1307 MIPSAssembler::MIPSAssembler(NULL, NULL) 1307 MIPSAssembler::MIPSAssembler(assembly)
1308{ 1308{
1309 mBase = mPC = (uint32_t *)assembly;
1310} 1309}
1311 1310
1312MIPS64Assembler::~MIPS64Assembler() 1311MIPS64Assembler::~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
1256 mDuration = ggl_system_time(); 1256 mDuration = ggl_system_time();
1257} 1257}
1258 1258
1259MIPSAssembler::MIPSAssembler(void* assembly)
1260 : mParent(NULL), mAssembly(NULL)
1261{
1262 mBase = mPC = (uint32_t *)assembly;
1263}
1264
1259MIPSAssembler::~MIPSAssembler() 1265MIPSAssembler::~MIPSAssembler()
1260{ 1266{
1261} 1267}
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
242{ 242{
243public: 243public:
244 MIPSAssembler(const sp<Assembly>& assembly, ArmToMipsAssembler *parent); 244 MIPSAssembler(const sp<Assembly>& assembly, ArmToMipsAssembler *parent);
245 MIPSAssembler(void* assembly);
245 virtual ~MIPSAssembler(); 246 virtual ~MIPSAssembler();
246 247
247 virtual uint32_t* base() const; 248 virtual uint32_t* base() const;