Merge "libpixelflinger: MIPS64 assembler test bug fix"

am: f8d892c84a

* commit 'f8d892c84a2cec5f6ac24748d966873e69227041':
  libpixelflinger: MIPS64 assembler test bug fix

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()

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()
 {
 }

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;