From e0c9f2bc5a6ab19fa6e457a30a0f1231e09b0afb Mon Sep 17 00:00:00 2001
From: Ljubomir Papuga <ljubomir.papuga@imgtec.com>
Date: Tue, 15 Dec 2015 15:23:01 +0100
Subject: [PATCH] libpixelflinger: MIPS64 assembler test bug fix

Change-Id: I47f77790baabea85ee318976a2c44ab1c0c0b9cb
---
 libpixelflinger/codeflinger/MIPS64Assembler.cpp | 3 +--
 libpixelflinger/codeflinger/MIPSAssembler.cpp   | 6 ++++++
 libpixelflinger/codeflinger/MIPSAssembler.h     | 1 +
 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;