Silence deprecation warning (implicit capture of this on [=])

This commit is contained in:
Nekotekina 2020-02-10 11:55:53 +03:00
parent 1bc9fd2863
commit 4bc431ec31
31 changed files with 249 additions and 247 deletions

View file

@ -325,7 +325,7 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
Label label = c->newLabel();
c->kmovw(x86::k7, x86::word_ptr(label));
consts.emplace_back([=]
consts.emplace_back([=, this]
{
c->bind(label);
c->dq(cmask);
@ -966,7 +966,7 @@ inline asmjit::X86Mem spu_recompiler::XmmConst(v128 data)
{
xmm_label = c->newLabel();
consts.emplace_back([=]
consts.emplace_back([=, this]
{
c->align(asmjit::kAlignData, 16);
c->bind(xmm_label);
@ -1201,7 +1201,7 @@ void spu_recompiler::branch_set_link(u32 target)
c->mov(x86::dword_ptr(*qw1, 8), x86::r10d);
c->mov(x86::dword_ptr(*qw1, 12), pc0->r32());
after.emplace_back([=, target = local->second]
after.emplace_back([=, this, target = local->second]
{
// Clear return info after use
c->align(kAlignCode, 16);
@ -1261,7 +1261,7 @@ void spu_recompiler::get_events()
c->jnz(rcheck);
// Reservation check (unlikely)
after.emplace_back([=]
after.emplace_back([=, this]()
{
Label fail = c->newLabel();
c->bind(rcheck);
@ -1327,7 +1327,7 @@ void spu_recompiler::get_events()
c->jnz(tcheck);
// Check decrementer event (unlikely)
after.emplace_back([=]
after.emplace_back([=, this]()
{
auto sub = [](spu_thread* _spu)
{
@ -1348,7 +1348,7 @@ void spu_recompiler::get_events()
c->jnc(treset);
// Set SPU_EVENT_TM (unlikely)
after.emplace_back([=]
after.emplace_back([=, this]()
{
c->bind(treset);
c->lock().bts(SPU_OFF_32(ch_event_stat), 5);
@ -1357,7 +1357,7 @@ void spu_recompiler::get_events()
Label fail = c->newLabel();
after.emplace_back([=]
after.emplace_back([=, this]()
{
auto _throw = [](spu_thread* _spu)
{
@ -1504,7 +1504,7 @@ void spu_recompiler::RDCH(spu_opcode_t op)
c->bt(addr->r64(), spu_channel::off_count);
c->jnc(wait);
after.emplace_back([=, pos = m_pos]
after.emplace_back([=, this, pos = m_pos]
{
c->bind(wait);
c->lea(addr->r64(), get_pc(pos));
@ -1637,7 +1637,7 @@ void spu_recompiler::RDCH(spu_opcode_t op)
Label ret = c->newLabel();
c->jz(wait);
after.emplace_back([=, pos = m_pos]
after.emplace_back([=, this, pos = m_pos]
{
c->bind(wait);
c->lea(addr->r64(), get_pc(pos));
@ -2450,7 +2450,7 @@ void spu_recompiler::WRCH(spu_opcode_t op)
c->bt(addr->r64(), spu_channel::off_count);
c->jc(wait);
after.emplace_back([=, pos = m_pos]
after.emplace_back([=, this, pos = m_pos]
{
c->bind(wait);
c->lea(addr->r64(), get_pc(pos));
@ -2477,7 +2477,7 @@ void spu_recompiler::WRCH(spu_opcode_t op)
c->cmp(SPU_OFF_32(ch_tag_upd), 0);
c->jnz(upd);
after.emplace_back([=, pos = m_pos]
after.emplace_back([=, this, pos = m_pos]
{
c->bind(upd);
c->lea(addr->r64(), get_pc(pos));
@ -2501,7 +2501,7 @@ void spu_recompiler::WRCH(spu_opcode_t op)
c->cmp(qw0->r32(), 2);
c->ja(fail);
after.emplace_back([=, pos = m_pos]
after.emplace_back([=, this, pos = m_pos]
{
c->bind(fail);
c->lea(addr->r64(), get_pc(pos));
@ -2652,7 +2652,7 @@ void spu_recompiler::BIZ(spu_opcode_t op)
c->cmp(SPU_OFF_32(gpr, op.rt, &v128::_u32, 3), 0);
c->je(branch_label);
after.emplace_back([=, jt = m_targets[m_pos].size() > 1]
after.emplace_back([=, this, jt = m_targets[m_pos].size() > 1]
{
c->align(asmjit::kAlignCode, 16);
c->bind(branch_label);
@ -2668,7 +2668,7 @@ void spu_recompiler::BINZ(spu_opcode_t op)
c->cmp(SPU_OFF_32(gpr, op.rt, &v128::_u32, 3), 0);
c->jne(branch_label);
after.emplace_back([=, jt = m_targets[m_pos].size() > 1]
after.emplace_back([=, this, jt = m_targets[m_pos].size() > 1]
{
c->align(asmjit::kAlignCode, 16);
c->bind(branch_label);
@ -2684,7 +2684,7 @@ void spu_recompiler::BIHZ(spu_opcode_t op)
c->cmp(SPU_OFF_16(gpr, op.rt, &v128::_u16, 6), 0);
c->je(branch_label);
after.emplace_back([=, jt = m_targets[m_pos].size() > 1]
after.emplace_back([=, this, jt = m_targets[m_pos].size() > 1]
{
c->align(asmjit::kAlignCode, 16);
c->bind(branch_label);
@ -2700,7 +2700,7 @@ void spu_recompiler::BIHNZ(spu_opcode_t op)
c->cmp(SPU_OFF_16(gpr, op.rt, &v128::_u16, 6), 0);
c->jne(branch_label);
after.emplace_back([=, jt = m_targets[m_pos].size() > 1]
after.emplace_back([=, this, jt = m_targets[m_pos].size() > 1]
{
c->align(asmjit::kAlignCode, 16);
c->bind(branch_label);
@ -2792,7 +2792,7 @@ void spu_recompiler::BISLED(spu_opcode_t op)
asmjit::Label branch_label = c->newLabel();
c->jne(branch_label);
after.emplace_back([=]
after.emplace_back([=, this]()
{
c->align(asmjit::kAlignCode, 16);
c->bind(branch_label);
@ -3393,7 +3393,7 @@ void spu_recompiler::HGT(spu_opcode_t op)
asmjit::Label ret = c->newLabel();
c->jg(label);
after.emplace_back([=, pos = m_pos]
after.emplace_back([=, this, pos = m_pos]
{
c->bind(label);
c->lea(addr->r64(), get_pc(pos));
@ -3735,7 +3735,7 @@ void spu_recompiler::HLGT(spu_opcode_t op)
asmjit::Label ret = c->newLabel();
c->ja(label);
after.emplace_back([=, pos = m_pos]
after.emplace_back([=, this, pos = m_pos]
{
c->bind(label);
c->lea(addr->r64(), get_pc(pos));
@ -4065,7 +4065,7 @@ void spu_recompiler::HEQ(spu_opcode_t op)
asmjit::Label ret = c->newLabel();
c->je(label);
after.emplace_back([=, pos = m_pos]
after.emplace_back([=, this, pos = m_pos]
{
c->bind(label);
c->lea(addr->r64(), get_pc(pos));
@ -4168,7 +4168,7 @@ void spu_recompiler::BRZ(spu_opcode_t op)
c->cmp(SPU_OFF_32(gpr, op.rt, &v128::_u32, 3), 0);
c->je(branch_label);
after.emplace_back([=]
after.emplace_back([=, this]()
{
c->align(asmjit::kAlignCode, 16);
c->bind(branch_label);
@ -4208,7 +4208,7 @@ void spu_recompiler::BRNZ(spu_opcode_t op)
c->cmp(SPU_OFF_32(gpr, op.rt, &v128::_u32, 3), 0);
c->jne(branch_label);
after.emplace_back([=]
after.emplace_back([=, this]()
{
c->align(asmjit::kAlignCode, 16);
c->bind(branch_label);
@ -4229,7 +4229,7 @@ void spu_recompiler::BRHZ(spu_opcode_t op)
c->cmp(SPU_OFF_16(gpr, op.rt, &v128::_u16, 6), 0);
c->je(branch_label);
after.emplace_back([=]
after.emplace_back([=, this]()
{
c->align(asmjit::kAlignCode, 16);
c->bind(branch_label);
@ -4250,7 +4250,7 @@ void spu_recompiler::BRHNZ(spu_opcode_t op)
c->cmp(SPU_OFF_16(gpr, op.rt, &v128::_u16, 6), 0);
c->jne(branch_label);
after.emplace_back([=]
after.emplace_back([=, this]()
{
c->align(asmjit::kAlignCode, 16);
c->bind(branch_label);
@ -4587,7 +4587,7 @@ void spu_recompiler::HGTI(spu_opcode_t op)
asmjit::Label ret = c->newLabel();
c->jg(label);
after.emplace_back([=, pos = m_pos]
after.emplace_back([=, this, pos = m_pos]
{
c->bind(label);
c->lea(addr->r64(), get_pc(pos));
@ -4632,7 +4632,7 @@ void spu_recompiler::HLGTI(spu_opcode_t op)
asmjit::Label ret = c->newLabel();
c->ja(label);
after.emplace_back([=, pos = m_pos]
after.emplace_back([=, this, pos = m_pos]
{
c->bind(label);
c->lea(addr->r64(), get_pc(pos));
@ -4695,7 +4695,7 @@ void spu_recompiler::HEQI(spu_opcode_t op)
asmjit::Label ret = c->newLabel();
c->je(label);
after.emplace_back([=, pos = m_pos]
after.emplace_back([=, this, pos = m_pos]
{
c->bind(label);
c->lea(addr->r64(), get_pc(pos));