HomeFreeBSD

emulators/yuzu: unbreak runtime after c758d1cbfc42

Description

emulators/yuzu: unbreak runtime after c758d1cbfc42

Bundle xbyak like emulators/citra as dynarmic upstream is gone.

$ yuzu
<select game>
Abort trap
(lldb) bt

  • thread #22, name = 'CPUCore_0', stop reason = signal SIGABRT
    • frame #0: 0x0000000840e0b27a libc.so.7`sys_thr_kill at thr_kill.S:4 frame #1: 0x0000000840d85284 libc.so.7`raise(s=6) at raise.c:50:10 frame #2: 0x0000000840e35009 libc.so.7`abort at abort.c:65:8 frame #3: 0x000000083e6dfc07 libcxxrt.so.1`report_failure(err=<unavailable>, thrown_exception=0x000013e856697280) at exception.cc:734:5 frame #4: 0x0000000002e6bfd1 yuzu`Xbyak::CodeGenerator::opMR(this=0x000013e85af00b10, addr=0x000013ea4f1fe718, r=0x000013ea4f1feb38, type=0, code=136, type2=0, code2=136) at xbyak.h:2100:109 frame #5: 0x0000000002e71d11 yuzu`Xbyak::CodeGenerator::opRO(this=0x000013e85af00b10, r=0x000013ea4f1feb38, op=0x000013ea4f1feb40, type=0, code=136, condR=false, immSize=0) at xbyak.h:2312:4 frame #6: 0x0000000002e72047 yuzu`Xbyak::CodeGenerator::opRO_MR(this=0x000013e85af00b10, op1=0x000013ea4f1feb40, op2=0x000013ea4f1feb38, code=136) at xbyak.h:2339:4 frame #7: 0x0000000002e67193 yuzu`Xbyak::CodeGenerator::mov(this=0x000013e85af00b10, op1=0x000013ea4f1feb40, op2=0x000013ea4f1feb38) at xbyak.h:3038:4 frame #8: 0x0000000002f0b3fe yuzu`Dynarmic::Backend::X64::RegAlloc::EmitMove(this=0x000013ea4f1ff500, bit_width=64, to=FirstSpill, from=RAX) at reg_alloc.cpp:748:18 frame #9: 0x0000000002f09074 yuzu`Dynarmic::Backend::X64::RegAlloc::Move(this=0x000013ea4f1ff500, to=FirstSpill, from=RAX) at reg_alloc.cpp:610:5 frame #10: 0x0000000002f0bc80 yuzu`Dynarmic::Backend::X64::RegAlloc::SpillRegister(this=0x000013ea4f1ff500, loc=RAX) at reg_alloc.cpp:654:5 frame #11: 0x0000000002f08f8f yuzu`Dynarmic::Backend::X64::RegAlloc::MoveOutOfTheWay(this=0x000013ea4f1ff500, reg=RAX) at reg_alloc.cpp:644:9 frame #12: 0x0000000002f086b0 yuzu`Dynarmic::Backend::X64::RegAlloc::ScratchImpl(this=0x000013ea4f1ff500, desired_locations=size=1) at reg_alloc.cpp:428:5 frame #13: 0x0000000002f0872d yuzu`Dynarmic::Backend::X64::RegAlloc::ScratchGpr(this=0x000013ea4f1ff500, desired_location=RAX) at reg_alloc.cpp:356:27 frame #14: 0x0000000002f68a08 yuzu`Dynarmic::Backend::X64::DoNZCV(code=0x000013e85af00b10, reg_alloc=0x000013ea4f1ff500, nzcv_out=0x000013e856611d10) at emit_x64_data_processing.cpp:914:41 frame #15: 0x0000000002f63b48 yuzu`Dynarmic::Backend::X64::EmitSub(code=0x000013e85af00b10, ctx=0x000013ea4f1ff488, inst=0x000013e856611ca8, bitsize=64) at emit_x64_data_processing.cpp:1027:31 frame #16: 0x0000000002f641be yuzu`Dynarmic::Backend::X64::EmitX64::EmitSub64(this=0x000013e85af01968, ctx=0x000013ea4f1ff488, inst=0x000013e856611ca8) at emit_x64_data_processing.cpp:1106:5 frame #17: 0x0000000003542e24 yuzu`Dynarmic::Backend::X64::A64EmitX64::Emit(this=0x000013e85af01968, block=0x000013ea4f1ff730) at opcodes.inc:131:1 frame #18: 0x000000000353e209 yuzu`Dynarmic::A64::Jit::Impl::GetBlock(this=0x000013e85af006c0, current_location=(value = 2147483656)) at a64_interface.cpp:290:24 frame #19: 0x000000000353de9a yuzu`Dynarmic::A64::Jit::Impl::GetCurrentBlock(this=0x000013e85af006c0) at a64_interface.cpp:252:16 frame #20: 0x000000000354057d yuzu`Dynarmic::A64::Jit::Impl::GetCurrentBlockThunk(thisptr=0x000013e85af006c0) at a64_interface.cpp:244:23

Regressed by: https://github.com/herumi/xbyak/commit/54173384271f
Reported by: SDK Chan

Details

Provenance
jbeichAuthored on Sat, May 3, 4:18 PM
Parents
R11:dbf985e24f5b: devel/py-libvirt: update to 11.3.0
Branches
Unknown
Tags
Unknown
OSZAR »