Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8d892c8 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "libpixelflinger: MIPS64 assembler test bug fix"

parents ec2f506e e0c9f2bc

libpixelflinger/codeflinger/MIPS64Assembler.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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

+6 −0
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ class MIPSAssembler 
{

public:

                MIPSAssembler(const sp<Assembly>& assembly, ArmToMipsAssembler *parent);

                MIPSAssembler(void* assembly);

    virtual     ~MIPSAssembler();



    virtual uint32_t*   base() const;